diff --git a/Telegram/SourceFiles/pspecific_linux.cpp b/Telegram/SourceFiles/pspecific_linux.cpp index bffa4d433c..8db3ac2a2d 100644 --- a/Telegram/SourceFiles/pspecific_linux.cpp +++ b/Telegram/SourceFiles/pspecific_linux.cpp @@ -803,6 +803,9 @@ QString psCurrentExeDirectory(int argc, char *argv[]) { QString first = argc ? QString::fromLocal8Bit(argv[0]) : QString(); if (!first.isEmpty()) { QFileInfo info(first); + if (info.isSymLink()) { + info = info.symLinkTarget(); + } if (info.exists()) { return QDir(info.absolutePath()).absolutePath() + '/'; } @@ -814,7 +817,10 @@ QString psCurrentExeName(int argc, char *argv[]) { QString first = argc ? QString::fromLocal8Bit(argv[0]) : QString(); if (!first.isEmpty()) { QFileInfo info(first); - if (info.exists()) { + if (info.isSymLink()) { + info = info.symLinkTarget(); + } + if (info.exists()) { return info.fileName(); } } diff --git a/Telegram/SourceFiles/settings.cpp b/Telegram/SourceFiles/settings.cpp index ea5b0dec16..40a3cd54f0 100644 --- a/Telegram/SourceFiles/settings.cpp +++ b/Telegram/SourceFiles/settings.cpp @@ -110,7 +110,7 @@ void settingsParseArgs(int argc, char *argv[]) { memset_rand(&gInstance, sizeof(gInstance)); gExeDir = psCurrentExeDirectory(argc, argv); gExeName = psCurrentExeName(argc, argv); - for (int32 i = 0; i < argc; ++i) { + for (int32 i = 0; i < argc; ++i) { if (string("-release") == argv[i]) { gTestMode = false; } else if (string("-debug") == argv[i]) { diff --git a/Telegram/SourceFiles/title.cpp b/Telegram/SourceFiles/title.cpp index 1ceea5ee2c..aa6a627c04 100644 --- a/Telegram/SourceFiles/title.cpp +++ b/Telegram/SourceFiles/title.cpp @@ -65,6 +65,8 @@ TitleWidget::TitleWidget(Window *window) { setGeometry(0, 0, wnd->width(), st::titleHeight); _update.hide(); + _cancel.hide(); + _back.hide(); if (App::app()->updatingState() == Application::UpdatingReady) { showUpdateBtn(); }