mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 06:55:58 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into notifications

Browse Source
This commit is contained in:
John Preston
2016-10-04 12:19:00 +03:00
parent c9288f2d0a 79a90956f7
commit a9929a5d51
11 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Telegram/SourceFiles/mainwindow.cpp
View File

@@ -265,6 +265,10 @@ void MainWindow::clearPasscode() {
notifyUpdateAll();
title->updateBackButton();
updateGlobalMenu();
if (auto main = App::main()) {
main->checkStartUrl();
}
}
void MainWindow::setupPasscode(bool anim) {
@@ -755,9 +759,8 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *e) {
QString url = static_cast<QFileOpenEvent*>(e)->url().toEncoded().trimmed();
if (url.startsWith(qstr("tg://"), Qt::CaseInsensitive)) {
cSetStartUrl(url.mid(0, 8192));
if (!cStartUrl().isEmpty() && App::main() && App::self()) {
App::main()->openLocalUrl(cStartUrl());
cSetStartUrl(QString());
if (auto main = App::main()) {
main->checkStartUrl();
}
}
activate();