starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-24 10:14:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

updater: Pass through parameters to restarted OBS instance

Browse Source
This commit is contained in:
derrod
2023-08-11 00:34:36 +02:00
committed by Rodney
parent 38f41f4f94
commit 014f7683cf
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/win-update/updater/updater.cpp
+5 -8
View File
@@ -1833,7 +1833,7 @@ static void CancelUpdate(bool quit)
}
}
static void LaunchOBS(bool portable)
static void LaunchOBS(LPWSTR lpCmdLine)
{
wchar_t newCwd[MAX_PATH];
wchar_t obsPath[MAX_PATH];
@@ -1859,8 +1859,8 @@ static void LaunchOBS(bool portable)
execInfo.lpDirectory = newCwd;
execInfo.nShow = SW_SHOWNORMAL;
if (portable)
execInfo.lpParameters = L"--portable";
if (lpCmdLine[0])
execInfo.lpParameters = lpCmdLine;
ShellExecuteEx(&execInfo);
}
@@ -1978,9 +1978,6 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
wchar_t cwd[MAX_PATH];
GetCurrentDirectoryW(_countof(cwd) - 1, cwd);
bool isPortable = wcsstr(lpCmdLine, L"Portable") != nullptr ||
wcsstr(lpCmdLine, L"--portable") != nullptr;
if (!IsWindows10OrGreater()) {
MessageBox(
nullptr,
@@ -2015,7 +2012,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
obs_base_directory, nullptr);
SetCurrentDirectory(obs_base_directory);
LaunchOBS(isPortable);
LaunchOBS(lpCmdLine);
}
if (hLowMutex) {
@@ -2064,7 +2061,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE, LPWSTR lpCmdLine, int)
WinHandle hMutex = OpenMutex(
SYNCHRONIZE, false, L"OBSUpdaterRunningAsNonAdminUser");
if (msg.wParam == 1 && !hMutex) {
LaunchOBS(isPortable);
LaunchOBS(lpCmdLine);
}
return (int)msg.wParam;