X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72ae85dd61608315d54cb417177d7850472c1989..3c9642b54de6f711a921de76303b06ecdec36ebb:/src/cocoa/evtloop.mm diff --git a/src/cocoa/evtloop.mm b/src/cocoa/evtloop.mm index d7870baa9a..32f9ccbfa1 100644 --- a/src/cocoa/evtloop.mm +++ b/src/cocoa/evtloop.mm @@ -12,6 +12,7 @@ #include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/app.h" #endif //WX_PRECOMP #include "wx/evtloop.h" @@ -87,7 +88,20 @@ void wxEventLoop::Exit(int rc) m_impl->SetExitCode(rc); NSApplication *cocoaApp = [NSApplication sharedApplication]; - wxLogDebug("wxEventLoop::Exit isRunning=%d", (int)[cocoaApp isRunning]); + wxLogTrace(wxTRACE_COCOA,wxT("wxEventLoop::Exit isRunning=%d"), (int)[cocoaApp isRunning]); + wxTheApp->WakeUpIdle(); + /* Notes: + If we're being called from idle time (which occurs while checking the + queue for new events) there may or may not be any events in the queue. + In order to successfully stop the event loop, at least one event must + be processed. To ensure this always happens, WakeUpIdle is called. + + If the application was active when closed then this is unnecessary + because it would receive a deactivate event anyway. However, if the + application was not active when closed, then no events would be + added to the queue by Cocoa and thus the application would wait + indefinitely for the next event. + */ [cocoaApp stop: cocoaApp]; }