Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for crash when using wxEXEC_NODISABLE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32516 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-03-01 10:19:24 +00:00
parent d45318b8b6
commit d60e233244
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/utilsexc.cpp
View File

@@ -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; void *cookie = NULL;
if ( !(flags & wxEXEC_NODISABLE) ) 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 // disable all app windows while waiting for the child process to finish
cookie = traits->BeforeChildWaitLoop(); 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; DWORD dwExitCode = data->dwExitCode;
delete data; delete data;