Fix activating account more than once.
This commit is contained in:
parent
762589b622
commit
a52bb21606
|
@ -442,6 +442,9 @@ void Domain::maybeActivate(not_null<Main::Account*> account) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void Domain::activate(not_null<Main::Account*> account) {
|
void Domain::activate(not_null<Main::Account*> account) {
|
||||||
|
if (const auto window = Core::App().separateWindowForAccount(account)) {
|
||||||
|
window->activate();
|
||||||
|
}
|
||||||
if (_active.current() == account.get()) {
|
if (_active.current() == account.get()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -897,10 +897,14 @@ void AccountsList::rebuild() {
|
||||||
Core::App().domain().maybeActivate(account);
|
Core::App().domain().maybeActivate(account);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
base::call_delayed(
|
if (Core::App().separateWindowForAccount(account)) {
|
||||||
st::defaultRippleAnimation.hideDuration,
|
activate();
|
||||||
account,
|
} else {
|
||||||
std::move(activate));
|
base::call_delayed(
|
||||||
|
st::defaultRippleAnimation.hideDuration,
|
||||||
|
account,
|
||||||
|
std::move(activate));
|
||||||
|
}
|
||||||
};
|
};
|
||||||
button.reset(inner->add(MakeAccountButton(
|
button.reset(inner->add(MakeAccountButton(
|
||||||
inner,
|
inner,
|
||||||
|
|
Loading…
Reference in New Issue