void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix a crash in main settings destructor.

Browse source 
Fixes #27544.
This commit is contained in:
John Preston 2024-03-12 23:19:59 +04:00
parent c6f49486ee
commit 8c5db25476
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.cpp
View file

@ -159,6 +159,10 @@ void EmojiStatusPanel::show(Descriptor &&descriptor) {
_panel->toggleAnimated(); _panel->toggleAnimated();
} }
bool EmojiStatusPanel::hasFocus() const {
return _panel && Ui::InFocusChain(_panel.get());
}
void EmojiStatusPanel::repaint() { void EmojiStatusPanel::repaint() {
_panel->selector()->update(); _panel->selector()->update();
} }

1
Telegram/SourceFiles/info/profile/info_profile_emoji_status_panel.h
View file

@ -46,6 +46,7 @@ public:
not_null<Window::SessionController*> controller, not_null<Window::SessionController*> controller,
not_null<QWidget*> button, not_null<QWidget*> button,
Data::CustomEmojiSizeTag animationSizeTag = {}); Data::CustomEmojiSizeTag animationSizeTag = {});
[[nodiscard]] bool hasFocus() const;
struct Descriptor { struct Descriptor {
not_null<Window::SessionController*> controller; not_null<Window::SessionController*> controller;

11
Telegram/SourceFiles/settings/settings_main.cpp
View file

@ -174,7 +174,16 @@ Cover::Cover(
}, _name->lifetime()); }, _name->lifetime());
} }
Cover::~Cover() = default; Cover::~Cover() {
if (_emojiStatusPanel.hasFocus()) {
// Panel will try to return focus to the layer widget, the problem is
// we are destroying the layer widget probably right now and focusing
// it will lead to a crash, because it destroys its children (how we
// got here) after it clears focus out of itself. So if you return
// the focus inside a child destructor, it won't be cleared at all.
window()->setFocus();
}
}
void Cover::setupChildGeometry() { void Cover::setupChildGeometry() {
using namespace rpl::mappers; using namespace rpl::mappers;