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

Fix launching with a passcode on macOS.

Browse Source
This commit is contained in:
John Preston 2020-06-26 11:51:05 +04:00
parent 70fdc4eb39
commit 325840703e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/platform/linux/main_window_linux.cpp
View File

@ -873,7 +873,7 @@ void MainWindow::createGlobalMenu() {
App::wnd()->showFromTray();
}
if (!account().sessionExists()) {
if (!sessionController()) {
return;
}
@ -1027,7 +1027,7 @@ void MainWindow::updateGlobalMenuHook() {
canDelete = list->canDeleteSelected();
}
App::wnd()->updateIsActive();
const auto logged = account().sessionExists();
const auto logged = (sessionController() != nullptr);
const auto inactive = !logged || controller().locked();
const auto support = logged && account().session().supportMode();
ForceDisabled(psLogout, !logged && !Core::App().passcodeLocked());

4
Telegram/SourceFiles/platform/mac/main_window_mac.mm
View File

@ -729,7 +729,7 @@ void MainWindow::createGlobalMenu() {
if (isHidden()) {
App::wnd()->showFromTray();
}
if (!account().sessionExists()) {
if (!sessionController()) {
return;
}
Ui::show(Box<PeerListBox>(std::make_unique<ContactsBoxController>(sessionController()), [](not_null<PeerListBox*> box) {
@ -835,7 +835,7 @@ void MainWindow::updateGlobalMenuHook() {
[_private->_touchBar showInputFieldItem:showTouchBarItem];
}
App::wnd()->updateIsActive();
const auto logged = account().sessionExists();
const auto logged = (sessionController() != nullptr);
const auto inactive = !logged || controller().locked();
const auto support = logged && account().session().supportMode();
ForceDisabled(psLogout, !logged && !Core::App().passcodeLocked());