From a57b1417f9cb8ec4fed463d5ed6f2fab9e2950c4 Mon Sep 17 00:00:00 2001 From: Qv2ray-dev <59914293+Qv2ray-dev@users.noreply.github.com> Date: Thu, 12 Mar 2020 09:50:57 +0800 Subject: [PATCH] fix: fixed autostart when using AppImage --- makespec/BUILDVERSION | 2 +- src/components/autolaunch/QvAutoLaunch.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION index 66be7d9d..547a10ee 100644 --- a/makespec/BUILDVERSION +++ b/makespec/BUILDVERSION @@ -1 +1 @@ -4663 \ No newline at end of file +4664 \ No newline at end of file diff --git a/src/components/autolaunch/QvAutoLaunch.cpp b/src/components/autolaunch/QvAutoLaunch.cpp index 96a672fd..cdf2f006 100644 --- a/src/components/autolaunch/QvAutoLaunch.cpp +++ b/src/components/autolaunch/QvAutoLaunch.cpp @@ -155,8 +155,11 @@ namespace Qv2ray::components::autolaunch } #elif defined Q_OS_LINUX - // From - // https://github.com/nextcloud/desktop/blob/master/src/common/utility_unix.cpp + // + // For AppImage packaging. + auto binPath = qEnvironmentVariableIsSet("APPIMAGE") ? qEnvironmentVariable("APPIMAGE") : QCoreApplication::applicationFilePath(); + // + // From https://github.com/nextcloud/desktop/blob/master/src/common/utility_unix.cpp QString appName = QApplication::applicationName(); QString userAutoStartPath = getUserAutostartDir_private(); QString desktopFileLocation = userAutoStartPath + appName + QLatin1String(".desktop"); @@ -184,7 +187,7 @@ namespace Qv2ray::components::autolaunch ts << QLatin1String("[Desktop Entry]") << endl << QLatin1String("Name=") << QApplication::applicationName() << endl << QLatin1String("GenericName=") << QLatin1String("V2ray Frontend") << endl - << QLatin1String("Exec=") << QCoreApplication::applicationFilePath() << endl + << QLatin1String("Exec=") << binPath << endl << QLatin1String("Terminal=") << "false" << endl << QLatin1String("Icon=") << "qv2ray" << endl // always use lowercase for icons << QLatin1String("Categories=") << "Network" << endl