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 crash on launch with passcode.

Browse source
This commit is contained in:
John Preston 2022-06-15 14:49:06 +04:00
parent 014cd19e93
commit aa484ac015
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -797,13 +797,11 @@ void Application::handleAppDeactivated() {
if (_primaryWindow) { if (_primaryWindow) {
_primaryWindow->updateIsActiveBlur(); _primaryWindow->updateIsActiveBlur();
} }
if (_domain->started()) { const auto session = _lastActiveWindow
const auto session = _lastActiveWindow ? _lastActiveWindow->maybeSession()
? _lastActiveWindow->account().maybeSession() : nullptr;
: nullptr; if (session) {
if (session) { session->updates().updateOnline();
session->updates().updateOnline();
}
} }
Ui::Tooltip::Hide(); Ui::Tooltip::Hide();
} }
@ -1235,8 +1233,8 @@ void Application::windowActivated(not_null<Window::Controller*> window) {
const auto now = window; const auto now = window;
_lastActiveWindow = window; _lastActiveWindow = window;
const auto wasSession = was ? was->account().maybeSession() : nullptr; const auto wasSession = was ? was->maybeSession() : nullptr;
const auto nowSession = now->account().maybeSession(); const auto nowSession = now->maybeSession();
if (wasSession != nowSession) { if (wasSession != nowSession) {
if (wasSession) { if (wasSession) {
wasSession->updates().updateOnline(); wasSession->updates().updateOnline();

4
Telegram/SourceFiles/window/window_controller.cpp
View file

@ -251,6 +251,10 @@ void Controller::finishFirstShow() {
checkThemeEditor(); checkThemeEditor();
} }
Main::Session *Controller::maybeSession() const {
return _account ? _account->maybeSession() : nullptr;
}
bool Controller::locked() const { bool Controller::locked() const {
if (Core::App().passcodeLocked()) { if (Core::App().passcodeLocked()) {
return true; return true;

5
Telegram/SourceFiles/window/window_controller.h
View file

@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Main { namespace Main {
class Account; class Account;
class Session;
} // namespace Main } // namespace Main
namespace Media::View { namespace Media::View {
@ -46,6 +47,10 @@ public:
return *_account; return *_account;
} }
[[nodiscard]] Main::Account *maybeAccount() const {
return _account;
}
[[nodiscard]] Main::Session *maybeSession() const;
[[nodiscard]] SessionController *sessionController() const { [[nodiscard]] SessionController *sessionController() const {
return _sessionController.get(); return _sessionController.get();
} }