From 7bf9db8644a23b3c67c39a96fd8b946a0d8781ad Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Wed, 8 Jun 2022 11:07:17 +0300
Subject: [PATCH] Fixed logging out with opened non-primary windows.

---
 Telegram/SourceFiles/platform/linux/main_window_linux.cpp | 3 ++-
 Telegram/SourceFiles/platform/mac/main_window_mac.mm      | 3 ++-
 Telegram/SourceFiles/window/window_controller.cpp         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 58d1165c9..d0203d665 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -561,7 +561,8 @@ void MainWindow::updateGlobalMenuHook() {
 	updateIsActive();
 	const auto logged = (sessionController() != nullptr);
 	const auto inactive = !logged || controller().locked();
-	const auto support = logged && account().session().supportMode();
+	const auto support = logged
+		&& sessionController()->session().supportMode();
 	ForceDisabled(psLogout, !logged && !Core::App().passcodeLocked());
 	ForceDisabled(psUndo, !canUndo);
 	ForceDisabled(psRedo, !canRedo);
diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
index 40d662bb0..1772d0eaa 100644
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@@ -519,7 +519,8 @@ void MainWindow::updateGlobalMenuHook() {
 	updateIsActive();
 	const auto logged = (sessionController() != nullptr);
 	const auto inactive = !logged || controller().locked();
-	const auto support = logged && account().session().supportMode();
+	const auto support = logged
+		&& sessionController()->session().supportMode();
 	ForceDisabled(psLogout, !logged && !Core::App().passcodeLocked());
 	ForceDisabled(psUndo, !canUndo);
 	ForceDisabled(psRedo, !canRedo);
diff --git a/Telegram/SourceFiles/window/window_controller.cpp b/Telegram/SourceFiles/window/window_controller.cpp
index 909f83ce4..cad568bb2 100644
--- a/Telegram/SourceFiles/window/window_controller.cpp
+++ b/Telegram/SourceFiles/window/window_controller.cpp
@@ -96,7 +96,7 @@ void Controller::showAccount(
 
 	_account->sessionValue(
 	) | rpl::start_with_next([=](Main::Session *session) {
-		if (!session && !isPrimary()) {
+		if (!isPrimary() && (&_singlePeer->session() != session)) {
 			Core::App().closeWindow(this);
 			return;
 		}