mirror of https://github.com/PCSX2/pcsx2.git
wxWidgets/Win32: Bugfixed wxLog getting perma-suspended when calling YieldIfNeeded
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2031 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
6c631e009d
commit
950c99f886
|
@ -690,12 +690,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 )
|
||||
|
@ -706,6 +700,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
|
|||
return 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
|
||||
|
||||
s_inYield = true;
|
||||
|
||||
// we don't want to process WM_QUIT from here - it should be processed in
|
||||
|
|
Loading…
Reference in New Issue