mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Move _authSession to Main::Account.

Browse Source
This commit is contained in:
John Preston
2019-06-06 12:37:12 +03:00
parent 94c4ea6174
commit 263bbf1788
15 changed files with 85 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/window/main_window.cpp
View File

@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "window/window_lock_widgets.h"
#include "window/window_outdated_bar.h"
#include "boxes/confirm_box.h"
#include "main/main_account.h" // Account::authSessionValue.
#include "core/click_handler_types.h"
#include "core/application.h"
#include "core/sandbox.h"
@@ -125,11 +126,14 @@ MainWindow::MainWindow()
subscribe(Global::RefWorkMode(), [=](DBIWorkMode mode) {
workmodeUpdated(mode);
});
subscribe(Core::App().authSessionChanged(), [=] {
checkAuthSession();
Core::App().activeAccount().sessionValue(
) | rpl::start_with_next([=](AuthSession *session) {
_controller = session
? std::make_unique<Window::Controller>(session, this)
: nullptr;
updateWindowIcon();
});
checkAuthSession();
}, lifetime());
Core::App().termsLockValue(
) | rpl::start_with_next([=] {
@@ -639,14 +643,6 @@ void MainWindow::launchDrag(std::unique_ptr<QMimeData> data) {
}
}
void MainWindow::checkAuthSession() {
if (AuthSession::Exists()) {
_controller = std::make_unique<Window::Controller>(&Auth(), this);
} else {
_controller = nullptr;
}
}
void MainWindow::setInactivePress(bool inactive) {
_wasInactivePress = inactive;
if (_wasInactivePress) {