X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3fad64b429a8f88396ad3b1693b611206ee8ee5..2b9a7d4cc2f5f55df3d83f7cf2160cf9a509a4f2:/src/msw/utilsexc.cpp

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 226677c279..fbeb00691f 100644
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -888,14 +888,12 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         return pi.dwProcessId;
     }
 
-    wxAppTraits *traits = NULL;
+    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") );
+
     void *cookie = NULL;
     if ( !(flags & wxEXEC_NODISABLE) )
     {
-        if ( wxTheApp )
-            traits = wxTheApp->GetTraits();
-        wxCHECK_MSG( traits, -1, _T("no wxAppTraits in wxExecute()?") );
-
         // disable all app windows while waiting for the child process to finish
         cookie = traits->BeforeChildWaitLoop();
     }
@@ -916,8 +914,11 @@ long wxExecute(const wxString& cmd, int flags, wxProcess *handler)
         traits->AlwaysYield();
     }
 
-    if ( traits )
+    if ( !(flags & wxEXEC_NODISABLE) )
+    {
+        // reenable disabled windows back
         traits->AfterChildWaitLoop(cookie);
+    }
 
     DWORD dwExitCode = data->dwExitCode;
     delete data;