[[ Bug 13644 ]] wait loop not being broken

livecodesebastien · livecodesebastien · commit cd649885ad44 · 2014-10-13T18:13:01.000+01:00
diff --git a/docs/notes/bugfix-13644.md b/docs/notes/bugfix-13644.md
@@ -0,0 +1 @@
+# wait loop not being broken
diff --git a/engine/src/mac-core.mm b/engine/src/mac-core.mm
@@ -241,16 +241,20 @@ - (OSErr)preDispatchAppleEvent: (const AppleEvent *)p_event withReply: (AppleEve
     
     if (aeclass == kCoreEventClass && aeid == kAEAnswer)
         return MCAppleEventHandlerDoAEAnswer(p_event, p_reply, 0);
-
+    
+    // SN-2014-10-13: [[ Bug 13644 ]] Break the wait loop after we handled the Apple Event
     OSErr t_err;
     t_err = MCAppleEventHandlerDoSpecial(p_event, p_reply, 0);
-    if (t_err != errAEEventNotHandled)
-        return t_err;
+    if (t_err == errAEEventNotHandled)
+    {
+        if (aeclass == kCoreEventClass && aeid == kAEOpenDocuments)
+            t_err = MCAppleEventHandlerDoOpenDoc(p_event, p_reply, 0);
+    }
     
-    if (aeclass == kCoreEventClass && aeid == kAEOpenDocuments)
-        return MCAppleEventHandlerDoOpenDoc(p_event, p_reply, 0);
+    if (t_err != errAEEventNotHandled)
+        MCPlatformBreakWait();
     
-    return errAEEventNotHandled;
+    return t_err;
 }
 
 - (void)applicationWillFinishLaunching: (NSNotification *)notification
