MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed closing of main menu on activate account in separated window.

This commit is contained in:
23rd 2023-04-05 20:27:11 +03:00 committed by John Preston
parent 90cea58d28
commit 127bafa254
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/SourceFiles/settings/settings_information.cpp
View File

@ -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,