updates.

Signed-off-by: andreidanila1 <andrei.danila@analog.com>

Author: andreidanila1

core/include/core/application_restarter.h

@@ -44,7 +44,9 @@ class SCOPY_CORE_EXPORT ApplicationRestarter
 #endif
 
 private:
+#ifdef __linux__
 	static QStringList buildSudoEnvArgs();
+#endif
 
 	static ApplicationRestarter *pinstance_;
 	QString m_executable;

core/src/application_restarter.cpp

@@ -72,19 +72,6 @@ void ApplicationRestarter::triggerRestart()
 	qApp->exit();
 }
 
-QStringList ApplicationRestarter::buildSudoEnvArgs()
-{
-	QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-	const QStringList envKeys = env.keys();
-	QStringList envArgs;
-
-	for(const QString &key : envKeys) {
-		envArgs << QString("%1=%2").arg(key, env.value(key));
-	}
-
-	return envArgs;
-}
-
 #ifdef __linux__
 void ApplicationRestarter::triggerRestartWithSudo()
 {
@@ -93,13 +80,17 @@ void ApplicationRestarter::triggerRestartWithSudo()
 	}
 
 	ApplicationRestarter *instance = GetInstance();
+	if(!instance) {
+		return;
+	}
+
 	QString executable;
 
 #ifdef __appimage__
 	executable = qEnvironmentVariable("APPIMAGE");
 	if(executable.isEmpty()) {
-		qWarning() << "APPIMAGE environment variable not set";
-		return;
+		qWarning() << "APPIMAGE environment variable not set, falling back to executable path";
+		executable = QFileInfo(instance->m_executable).absoluteFilePath();
 	}
 #else
 	executable = QFileInfo(instance->m_executable).absoluteFilePath();
@@ -117,4 +108,17 @@ void ApplicationRestarter::triggerRestartWithSudo()
 	instance->m_restart = false;
 	qApp->exit();
 }
+
+QStringList ApplicationRestarter::buildSudoEnvArgs()
+{
+	QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+	const QStringList envKeys = env.keys();
+	QStringList envArgs;
+
+	for(const QString &key : envKeys) {
+		envArgs << QString("%1=%2").arg(key, env.value(key));
+	}
+
+	return envArgs;
+}
 #endif