From 127bafa25494b26c90a635be48da1312cfd0b173 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 5 Apr 2023 20:27:11 +0300
Subject: [PATCH] Fixed closing of main menu on activate account in separated
 window.

---
 .../SourceFiles/settings/settings_information.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp
index e8970637f..3ecd1ba5a 100644
--- a/Telegram/SourceFiles/settings/settings_information.cpp
+++ b/Telegram/SourceFiles/settings/settings_information.cpp
@@ -676,8 +676,7 @@ void SetupAccountsWrap(
 			state->menu);
 		addAction(tr::lng_context_new_window(tr::now), [=] {
 			Ui::PreventDelayedActivation();
-			Core::App().ensureSeparateWindowForAccount(account);
-			Core::App().domain().maybeActivate(account);
+			callback(Qt::ControlModifier);
 		}, &st::menuIconNewWindow);
 		Window::AddSeparatorAndShiftUp(addAction);
 
@@ -894,16 +893,18 @@ void AccountsList::rebuild() {
 				auto activate = [=, guard = _accountSwitchGuard.make_guard()]{
 					if (guard) {
 						_reorder->finishReordering();
-						if (newWindow) {
-							Core::App().ensureSeparateWindowForAccount(
-								account);
-						}
-						Core::App().domain().maybeActivate(account);
 					}
+					if (newWindow) {
+						Core::App().ensureSeparateWindowForAccount(
+							account);
+					}
+					Core::App().domain().maybeActivate(account);
 				};
 				if (Core::App().separateWindowForAccount(account)) {
+					_currentAccountActivations.fire({});
 					activate();
 				} else {
+					_currentAccountActivations.fire({});
 					base::call_delayed(
 						st::defaultRippleAnimation.hideDuration,
 						account,