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

Fix first passcode unlock.

Browse Source 
Fixes #4811.
This commit is contained in:
John Preston
2018-06-07 10:44:38 +03:00
parent 31ec831c71
commit 35659536c5
6 changed files with 38 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/mainwindow.cpp
View File

@@ -128,9 +128,11 @@ void MainWindow::firstShow() {
}
void MainWindow::clearWidgetsHook() {
Expects(_passcodeLock == nullptr || !Global::LocalPasscode());
auto wasMain = (_main != nullptr);
_passcodeLock.destroy();
_main.destroy();
_passcodeLock.destroy();
_intro.destroy();
if (wasMain) {
App::clearHistories();
@@ -177,18 +179,20 @@ void MainWindow::clearPasscodeLock() {
_passcodeLock.destroy();
if (_intro) {
_intro->showAnimated(bg, true);
} else {
Assert(_main != nullptr);
} else if (_main) {
_main->showAnimated(bg, true);
Messenger::Instance().checkStartUrl();
} else {
Messenger::Instance().startMtp();
if (AuthSession::Exists()) {
setupMain();
} else {
setupIntro();
}
}
}
void MainWindow::setupIntro() {
if (_intro && !_intro->isHidden() && !_main) {
return;
}
Ui::hideSettingsAndLayer(anim::type::instant);
auto animated = (_main || _passcodeLock);
@@ -273,13 +277,13 @@ void MainWindow::sendServiceHistoryRequest() {
}
void MainWindow::setupMain(const MTPUser *self) {
Expects(AuthSession::Exists());
auto animated = (_intro || _passcodeLock);
auto bg = animated ? grabInner() : QPixmap();
clearWidgets();
Assert(AuthSession::Exists());
_main.create(bodyWidget(), controller());
_main->show();
updateControlsGeometry();