MrBesen
/
tdesktop
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Restore initial working directory on restart 

So executable path computation still works for the new instance on systems deducing it by argv0
This commit is contained in:
Ilya Fedin 2023-08-14 08:45:09 +04:00 committed by John Preston
parent cc19928977
commit b35fff01b0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,12 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
: (cExeDir() + u"Updater"_q)).toStdString();
std::vector<std::string> argumentsList;
argumentsList.push_back(writeProtectedUpdate ? "pkexec" : binaryPath);
if (writeProtectedUpdate) {
argumentsList.push_back("pkexec");
argumentsList.push_back("--keep-cwd");
} else {
argumentsList.push_back(binaryPath);
}
argumentsList.push_back((justRelaunch && !arguments().isEmpty())
? arguments().first().toStdString()
: binaryPath);
@ -104,6 +109,7 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
// pkexec needs an alive parent
if (writeProtectedUpdate) {
if (!GLib::spawn_sync(
initialWorkingDir().toStdString(),
argumentsList,
std::nullopt,
GLib::SpawnFlags::SEARCH_PATH_,
@ -119,6 +125,7 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
}
return GLib::spawn_async(
initialWorkingDir().toStdString(),
argumentsList,
std::nullopt,
GLib::SpawnFlags::FILE_AND_ARGV_ZERO_,