starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-28 02:06:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

updater: Fix portable OBS not being relaunched correctly

Browse Source
This commit is contained in:
derrod
2023-01-14 15:30:58 -08:00
committed by Jim
parent 1805712f46
commit 143877c8ff
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/win-update/updater/updater.cpp
+8 -3
View File
@@ -1754,7 +1754,7 @@ static void CancelUpdate(bool quit)
}
}
static void LaunchOBS()
static void LaunchOBS(bool portable)
{
wchar_t cwd[MAX_PATH];
wchar_t newCwd[MAX_PATH];
@@ -1794,6 +1794,9 @@ static void LaunchOBS()
execInfo.lpDirectory = newCwd;
execInfo.nShow = SW_SHOWNORMAL;
if (portable)
execInfo.lpParameters = L"--portable";
ShellExecuteEx(&execInfo);
}
@@ -1907,6 +1910,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
GetCurrentDirectoryW(_countof(cwd) - 1, cwd);
is32bit = wcsstr(cwd, L"bin\\32bit") != nullptr;
bool isPortable = wcsstr(lpCmdLine, L"Portable") != nullptr ||
wcsstr(lpCmdLine, L"--portable") != nullptr;
if (!IsWindows10OrGreater()) {
MessageBox(
@@ -1942,7 +1947,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
nullptr);
SetCurrentDirectory(newPath);
LaunchOBS();
LaunchOBS(isPortable);
}
if (hLowMutex) {
@@ -1990,7 +1995,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
WinHandle hMutex = OpenMutex(
SYNCHRONIZE, false, L"OBSUpdaterRunningAsNonAdminUser");
if (msg.wParam == 1 && !hMutex) {
LaunchOBS();
LaunchOBS(isPortable);
}
return (int)msg.wParam;