ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Jake.Stine 2009-10-18 12:30:54 +00:00
parent 6c631e009d
commit 950c99f886
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/wxWidgets/src/msw/app.cpp vendored
View File

@ -690,12 +690,6 @@ bool wxApp::Yield(bool onlyIfNeeded)
// MT-FIXME // MT-FIXME
static bool s_inYield = false; 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 ( s_inYield )
{ {
if ( !onlyIfNeeded ) if ( !onlyIfNeeded )
@ -706,6 +700,12 @@ bool wxApp::Yield(bool onlyIfNeeded)
return false; 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; s_inYield = true;
// we don't want to process WM_QUIT from here - it should be processed in // we don't want to process WM_QUIT from here - it should be processed in