mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Fixed logging out with opened non-primary windows.

Browse Source
This commit is contained in:
23rd
2022-06-08 11:07:17 +03:00
parent 873301e7df
commit 7bf9db8644
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@@ -561,7 +561,8 @@ void MainWindow::updateGlobalMenuHook() {
updateIsActive(); updateIsActive();
const auto logged = (sessionController() != nullptr); const auto logged = (sessionController() != nullptr);
const auto inactive = !logged || controller().locked(); 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(psLogout, !logged && !Core::App().passcodeLocked());
ForceDisabled(psUndo, !canUndo); ForceDisabled(psUndo, !canUndo);
ForceDisabled(psRedo, !canRedo); ForceDisabled(psRedo, !canRedo);

3
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View File

@@ -519,7 +519,8 @@ void MainWindow::updateGlobalMenuHook() {
updateIsActive(); updateIsActive();
const auto logged = (sessionController() != nullptr); const auto logged = (sessionController() != nullptr);
const auto inactive = !logged || controller().locked(); 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(psLogout, !logged && !Core::App().passcodeLocked());
ForceDisabled(psUndo, !canUndo); ForceDisabled(psUndo, !canUndo);
ForceDisabled(psRedo, !canRedo); ForceDisabled(psRedo, !canRedo);

2
Telegram/SourceFiles/window/window_controller.cpp
View File

@@ -96,7 +96,7 @@ void Controller::showAccount(
_account->sessionValue( _account->sessionValue(
) | rpl::start_with_next([=](Main::Session *session) { ) | rpl::start_with_next([=](Main::Session *session) {
if (!session && !isPrimary()) { if (!isPrimary() && (&_singlePeer->session() != session)) {
Core::App().closeWindow(this); Core::App().closeWindow(this);
return; return;
} }