From 3e428faa2ed240775e870e606c02f7bc4a6ec6b3 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Sun, 6 Nov 2022 18:18:19 +0300 Subject: [PATCH] Fixed crash on creating of callback for adding items to non-exist menu. --- Telegram/SourceFiles/settings/settings_information.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp index 298fcec9b..e2ff0fd44 100644 --- a/Telegram/SourceFiles/settings/settings_information.cpp +++ b/Telegram/SourceFiles/settings/settings_information.cpp @@ -690,13 +690,13 @@ void SetupAccountsWrap( } else if (which != Qt::RightButton) { return; } - const auto addAction = Ui::Menu::CreateAddActionCallback( - state->menu); if (!state->menu && IsAltShift(raw->clickModifiers()) && !locked) { state->menu = base::make_unique_q( raw, st::popupMenuWithIcons); - Window::MenuAddMarkAsReadAllChatsAction(window, addAction); + Window::MenuAddMarkAsReadAllChatsAction( + window, + Ui::Menu::CreateAddActionCallback(state->menu)); state->menu->popup(QCursor::pos()); return; } @@ -707,6 +707,8 @@ void SetupAccountsWrap( state->menu = base::make_unique_q( raw, st::popupMenuWithIcons); + const auto addAction = Ui::Menu::CreateAddActionCallback( + state->menu); addAction(tr::lng_profile_copy_phone(tr::now), [=] { const auto phone = rpl::variable( Info::Profile::PhoneValue(session->user()));