cmd.exe: Wait when launching GUI pgms in batch.

09969e8d · Jason Edmeades · Alexandre Julliard · c8b6b2b1 · 09969e8d
Commit 09969e8d authored Aug 09, 2007 by Jason Edmeades Committed by Alexandre Julliard Aug 10, 2007
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

wcmdmain.c programs/cmd/wcmdmain.c +2 -1

No files found.
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -1090,7 +1090,8 @@ void WCMD_run_program (WCHAR *command, int called) {
        if (!assumeInternal && !console) errorlevel = 0;
        else
        {
-            if (assumeInternal || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE);
+            /* Always wait when called in a batch program context */
+            if (assumeInternal || context || !HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE);
            GetExitCodeProcess (pe.hProcess, &errorlevel);
            if (errorlevel == STILL_ACTIVE) errorlevel = 0;
        }