Merge pull request #1618 from CyberShadow/std-process-gui-spawnprocess

std.process: Fix spawnProcess in Windows GUI programs (issue #11180)
dlang · Oct 9, 2013 · e69f4dc · e69f4dc
2 parents 7875e39 + 24255bd
commit e69f4dc
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/std/process.d b/std/process.d
@@ -485,18 +485,21 @@ private Pid spawnProcessImpl(in char[] commandLine,
             version (DMC_RUNTIME) handle = _fdToHandle(fileDescriptor);
             else    /* MSVCRT */  handle = _get_osfhandle(fileDescriptor);
         }
+
         DWORD dwFlags;
-        GetHandleInformation(handle, &dwFlags);
-        if (!(dwFlags & HANDLE_FLAG_INHERIT))
+        if (GetHandleInformation(handle, &dwFlags))
         {
-            if (!SetHandleInformation(handle,
-                                      HANDLE_FLAG_INHERIT,
-                                      HANDLE_FLAG_INHERIT))
+            if (!(dwFlags & HANDLE_FLAG_INHERIT))
             {
-                throw new StdioException(
-                    "Failed to make "~which~" stream inheritable by child process ("
-                    ~sysErrorString(GetLastError()) ~ ')',
-                    0);
+                if (!SetHandleInformation(handle,
+                                          HANDLE_FLAG_INHERIT,
+                                          HANDLE_FLAG_INHERIT))
+                {
+                    throw new StdioException(
+                        "Failed to make "~which~" stream inheritable by child process ("
+                        ~sysErrorString(GetLastError()) ~ ')',
+                        0);
+                }
             }
         }
     }