Merge branch 'v1.10.1' into v1-issue-6338-auto-config
This commit is contained in:
commit
3bae5f3cc6
|
@ -371,11 +371,11 @@ MSWindowsWatchdog::startProcessInForeground(String& command)
|
||||||
// show the console window when in foreground mode,
|
// show the console window when in foreground mode,
|
||||||
// so we can close it gracefully, but minimize it
|
// so we can close it gracefully, but minimize it
|
||||||
// so it doesn't get in the way.
|
// so it doesn't get in the way.
|
||||||
STARTUPINFO si;
|
STARTUPINFO si;
|
||||||
setStartupInfo(si);
|
setStartupInfo(si);
|
||||||
si.dwFlags |= STARTF_USESHOWWINDOW;
|
si.dwFlags |= STARTF_USESHOWWINDOW;
|
||||||
si.wShowWindow = SW_MINIMIZE;
|
si.wShowWindow = SW_MINIMIZE;
|
||||||
|
|
||||||
return CreateProcess(
|
return CreateProcess(
|
||||||
NULL, LPSTR(command.c_str()), NULL, NULL,
|
NULL, LPSTR(command.c_str()), NULL, NULL,
|
||||||
TRUE, 0, NULL, NULL, &si, &m_processInfo);
|
TRUE, 0, NULL, NULL, &si, &m_processInfo);
|
||||||
|
@ -387,7 +387,7 @@ MSWindowsWatchdog::startProcessAsUser(String& command, HANDLE userToken, LPSECUR
|
||||||
// clear, as we're reusing process info struct
|
// clear, as we're reusing process info struct
|
||||||
ZeroMemory(&m_processInfo, sizeof(PROCESS_INFORMATION));
|
ZeroMemory(&m_processInfo, sizeof(PROCESS_INFORMATION));
|
||||||
|
|
||||||
STARTUPINFO si;
|
STARTUPINFO si;
|
||||||
setStartupInfo(si);
|
setStartupInfo(si);
|
||||||
|
|
||||||
LPVOID environment;
|
LPVOID environment;
|
||||||
|
|
Loading…
Reference in New Issue