fix(updater): Use module path, not working dir

Fix #3255
qTox · May 9, 2016 · 0a2e96a · 0a2e96a
1 parent 7c63594
commit 0a2e96a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/net/autoupdate.cpp b/src/net/autoupdate.cpp
@@ -492,11 +492,14 @@ void AutoUpdater::installLocalUpdate()
     // Workaround QTBUG-7645
     // QProcess fails silently when elevation is required instead of showing a UAC prompt on Win7/Vista
 #ifdef Q_OS_WIN
-    HINSTANCE result = ::ShellExecuteW(0, L"open", updaterBin.toStdWString().c_str(), 0, 0, SW_SHOWNORMAL);
+    QString modulePath = qApp->applicationDirPath().replace('/', '\\');
+    HINSTANCE result = ::ShellExecuteW(0, L"open", updaterBin.toStdWString().c_str(),
+                                       0, modulePath.toStdWString().c_str(), SW_SHOWNORMAL);
     if (result == (HINSTANCE)SE_ERR_ACCESSDENIED)
     {
         // Requesting elevation
-        result = ::ShellExecuteW(0, L"runas", updaterBin.toStdWString().c_str(), 0, 0, SW_SHOWNORMAL);
+        result = ::ShellExecuteW(0, L"runas", updaterBin.toStdWString().c_str(),
+                                 0, modulePath.toStdWString().c_str(), SW_SHOWNORMAL);
     }
     if (result <= (HINSTANCE)32)
         failExit();