From db0a31b87ef70629d543c47204efe7d9693e21ac Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 22 Nov 2023 13:01:19 +0400 Subject: [PATCH] Fix crash in scale preview reparenting. --- Telegram/SourceFiles/settings/settings_scale_preview.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/settings/settings_scale_preview.cpp b/Telegram/SourceFiles/settings/settings_scale_preview.cpp index efb797fee..b7501ea72 100644 --- a/Telegram/SourceFiles/settings/settings_scale_preview.cpp +++ b/Telegram/SourceFiles/settings/settings_scale_preview.cpp @@ -169,12 +169,13 @@ void Preview::watchParent() { } void Preview::reparent() { - if (_widget.window() == &_widget) { + const auto parent = _widget.parentWidget(); + if (!parent) { // macOS just removes parenting for a _window. _parentWatcher = nullptr; return; } - _widget.setParent(_widget.window()); + _widget.setParent(parent->window(), _widget.windowFlags()); if (_shown) { _widget.show(); updateGlobalPosition();