StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(appimage): Use external binary path when enabling autorun from appimage

Browse Source 
Fix #6241
This commit is contained in:
Anthony Bilinski 2021-09-22 19:33:21 -07:00
parent 5852d61914
commit da5c165f41
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/platform/autorun_xdg.cpp
View File

@ -38,9 +38,21 @@ QString getAutostartFilePath(QString dir)
return dir + "/qTox - " + Settings::getInstance().getCurrentProfile() + ".desktop";
}
inline QString currentCommandLine()
QString currentBinPath()
{
return "\"" + QApplication::applicationFilePath() + "\" -p \""
const auto env = QProcessEnvironment::systemEnvironment();
const auto appImageEnvKey = QStringLiteral("APPIMAGE");
if (env.contains(appImageEnvKey)) {
return env.value(appImageEnvKey);
} else {
return QApplication::applicationFilePath();
}
}
inline QString profileRunCommand()
{
return "\"" + currentBinPath() + "\" -p \""
+ Settings::getInstance().getCurrentProfile() + "\"";
}
}
@ -56,7 +68,7 @@ bool Platform::setAutorun(bool on)
desktop.write("Type=Application\n");
desktop.write("Name=qTox\n");
desktop.write("Exec=");
desktop.write(currentCommandLine().toUtf8());
desktop.write(profileRunCommand().toUtf8());
desktop.write("\n");
desktop.close();
return true;