X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa28b00cdcce49eae46ac7f2c39c3c4fc6946165..abb6edd197b78d24f762257a7880539556d10505:/src/dfb/app.cpp?ds=sidebyside

diff --git a/src/dfb/app.cpp b/src/dfb/app.cpp
index 2883ee6f54..2cac31028b 100644
--- a/src/dfb/app.cpp
+++ b/src/dfb/app.cpp
@@ -20,6 +20,7 @@
 
 #include "wx/evtloop.h"
 #include "wx/dfb/private.h"
+#include "wx/private/fontmgr.h"
 
 //-----------------------------------------------------------------------------
 // wxApp initialization
@@ -57,6 +58,8 @@ void wxApp::CleanUp()
 {
     wxAppBase::CleanUp();
 
+    wxFontsManager::CleanUp();
+
     wxEventLoop::CleanUp();
     wxIDirectFB::CleanUp();
 }
@@ -102,7 +105,9 @@ void wxApp::WakeUpIdle()
         wxMutexGuiEnter();
 #endif
 
-    wxEventLoop::GetActive()->WakeUp();
+    wxEventLoop * const loop = wxEventLoop::GetActive();
+    if ( loop )
+        loop->WakeUp();
 
 #if wxUSE_THREADS
     if (!wxThread::IsMain())
@@ -134,11 +139,9 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     wxLog::Suspend();
 
-    if ( wxEventLoop::GetActive() )
-    {
-        while (wxEventLoop::GetActive()->Pending())
-            wxEventLoop::GetActive()->Dispatch();
-    }
+    wxEventLoop * const loop = wxEventLoop::GetActive();
+    if ( loop )
+        loop->Yield();
 
     // it's necessary to call ProcessIdle() to update the frames sizes which
     // might have been changed (it also will update other things set from