RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-01 03:50:43 +00:00
Code Issues Projects Releases Wiki Activity

Check action type before launching new version

Browse Source
This commit is contained in:
Ilya Fedin 2021-05-03 15:48:31 +04:00 committed by John Preston
parent 68dc00be27
commit 9a857659ce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
: (cExeDir() + qsl("Updater"))); : (cExeDir() + qsl("Updater")));
auto argumentsList = Arguments(); auto argumentsList = Arguments();
if (action != UpdaterLaunch::JustRelaunch && cWriteProtected()) { if (action == UpdaterLaunch::PerformUpdate && cWriteProtected()) {
argumentsList.push("pkexec"); argumentsList.push("pkexec");
} }
argumentsList.push(QFile::encodeName(binaryPath)); argumentsList.push(QFile::encodeName(binaryPath));
@ -141,7 +141,7 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
} }
// pkexec needs an alive parent // pkexec needs an alive parent
if (cWriteProtected()) { if (action == UpdaterLaunch::PerformUpdate && cWriteProtected()) {
waitpid(pid, nullptr, 0); waitpid(pid, nullptr, 0);
// launch new version in the same environment // launch new version in the same environment
return launchUpdater(UpdaterLaunch::JustRelaunch); return launchUpdater(UpdaterLaunch::JustRelaunch);