From 69e33a6657f40d8b36cf81c1e77458d09e4d541e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 9 May 2018 02:38:30 +0200 Subject: [PATCH] Yet another fix for not existing event loop under Mac The previous commit fixed never exiting the event loop in GUI Mac modal loops but at the price of breaking it for Mac console applications as Dispatch() never returns for them if there are no more events. Finally, just don't call Dispatch() at all here, just as it wasn't done until 9caa3d5d8e279a6420f040c756239bcd31a0dde7 and keep only the changes sufficient for dispatching the pending events and making CallAfter() work in console applications. --- src/osx/core/evtloop_cf.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/osx/core/evtloop_cf.cpp b/src/osx/core/evtloop_cf.cpp index da8befe126..c724b44a5c 100644 --- a/src/osx/core/evtloop_cf.cpp +++ b/src/osx/core/evtloop_cf.cpp @@ -301,11 +301,6 @@ void wxCFEventLoop::OSXDoRun() hasMoreEvents = true; } - if ( Dispatch() ) - { - hasMoreEvents = true; - } - if ( !hasMoreEvents ) break; }