void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix account activation after window closing.

Browse source
This commit is contained in:
John Preston 2023-01-23 09:29:35 +04:00
parent 58cedb796e
commit 5278ed1f41
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/core/application.cpp
View file

@ -1344,6 +1344,12 @@ void Application::closeWindow(not_null<Window::Controller*> window) {
++i; ++i;
} }
} }
const auto account = domain().started()
? &domain().active()
: nullptr;
if (account && !_primaryWindows.contains(account) && _lastActiveWindow) {
domain().activate(&_lastActiveWindow->account());
}
} }
void Application::closeChatFromWindows(not_null<PeerData*> peer) { void Application::closeChatFromWindows(not_null<PeerData*> peer) {

5
Telegram/SourceFiles/settings/settings_information.cpp
View file

@ -564,7 +564,7 @@ void SetupAccountsWrap(
not_null<Main::Account*> account, not_null<Main::Account*> account,
Fn<void(Qt::KeyboardModifiers)> callback, Fn<void(Qt::KeyboardModifiers)> callback,
bool locked) { bool locked) {
const auto active = (account == &Core::App().activeAccount()); const auto active = (account == &window->session().account());
const auto session = &account->session(); const auto session = &account->session();
const auto user = session->user(); const auto user = session->user();
@ -659,8 +659,7 @@ void SetupAccountsWrap(
state->menu->popup(QCursor::pos()); state->menu->popup(QCursor::pos());
return; return;
} }
if (&session->account() == &Core::App().activeAccount() if (session == &window->session() || state->menu) {
|| state->menu) {
return; return;
} }
state->menu = base::make_unique_q<Ui::PopupMenu>( state->menu = base::make_unique_q<Ui::PopupMenu>(