RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix background reset on language change.

This commit is contained in:
John Preston 2019-03-12 12:07:39 +04:00
parent a95a055acd
commit 5c3f667fc3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/core/application.cpp
View File

@ -171,7 +171,7 @@ void Application::run() {
DEBUG_LOG(("Application Info: showing."));
_window->firstShow();
if (cStartToSettings()) {
if (!locked() && cStartToSettings()) {
_window->showSettings();
}

11
Telegram/SourceFiles/mainwindow.cpp
View File

@ -241,7 +241,12 @@ void MainWindow::setupMain() {
}
void MainWindow::showSettings() {
if (isHidden()) showFromTray();
if (isHidden()) {
showFromTray();
}
if (_passcodeLock) {
return;
}
if (const auto controller = this->controller()) {
controller->showSettings();
@ -253,7 +258,9 @@ void MainWindow::showSettings() {
void MainWindow::showSpecialLayer(
object_ptr<Window::LayerWidget> layer,
anim::type animated) {
if (_passcodeLock) return;
if (_passcodeLock) {
return;
}
if (layer) {
ensureLayerCreated();