From 950c99f88646d3328725769768f8aa016b5e3005 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Sun, 18 Oct 2009 12:30:54 +0000 Subject: [PATCH] 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 --- 3rdparty/wxWidgets/src/msw/app.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/3rdparty/wxWidgets/src/msw/app.cpp b/3rdparty/wxWidgets/src/msw/app.cpp index a00f5185d3..b307a339a0 100644 --- a/3rdparty/wxWidgets/src/msw/app.cpp +++ b/3rdparty/wxWidgets/src/msw/app.cpp @@ -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