AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make wxApp::Yield() exception-safe

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54573 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2008-07-10 02:07:44 +00:00
parent 1eebb103c7
commit fcf92c3a0d
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/msw/app.cpp
View File

@ -50,6 +50,7 @@
#include "wx/dynlib.h"
#include "wx/evtloop.h"
#include "wx/thread.h"
#include "wx/scopeguard.h"
#include "wx/msw/private.h"
#include "wx/msw/dc.h"
@ -1067,12 +1068,6 @@ bool wxApp::Yield(bool onlyIfNeeded)
// MT-FIXME
static bool s_inYield = false;
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
#endif // wxUSE_LOG
if ( s_inYield )
{
if ( !onlyIfNeeded )
@ -1083,7 +1078,20 @@ bool wxApp::Yield(bool onlyIfNeeded)
return false;
}
// set the flag and don't forget to reset it before returning
s_inYield = true;
wxON_BLOCK_EXIT_SET(s_inYield, false);
#if wxUSE_LOG
// disable log flushing from here because a call to wxYield() shouldn't
// normally result in message boxes popping up &c
wxLog::Suspend();
// ensure the logs will be flashed again when we exit
wxON_BLOCK_EXIT0(wxLog::Resume);
#endif // wxUSE_LOG
// we don't want to process WM_QUIT from here - it should be processed in
// the main event loop in order to stop it
@ -1103,13 +1111,6 @@ bool wxApp::Yield(bool onlyIfNeeded)
// if there are pending events, we must process them.
ProcessPendingEvents();
#if wxUSE_LOG
// let the logs be flashed again
wxLog::Resume();
#endif // wxUSE_LOG
s_inYield = false;
return true;
}