fix for crash when using wxEXEC_NODISABLE

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 226677c279bde464c0f14eeccb0cf6b57b323074..fbeb00691f7e7e1dd28caff48dc2ff0cba37c8a1 100644 (file)
--- 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;
     }
 
         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) )
     {
     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();
     }
         // 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();
     }
 
         traits->AlwaysYield();
     }
 

-    if ( traits )
+    if ( !(flags & wxEXEC_NODISABLE) )
+    {
+        // reenable disabled windows back

         traits->AfterChildWaitLoop(cookie);
         traits->AfterChildWaitLoop(cookie);

+    }

 
     DWORD dwExitCode = data->dwExitCode;
     delete data;
 
     DWORD dwExitCode = data->dwExitCode;
     delete data;