“Fix” for loop cancellation

8 years ago · 5054f2b9eb
1 changed files with 3 additions and 1 deletions
--- a/src/Avalonia.Native.OSX/platformthreading.mm
+++ b/src/Avalonia.Native.OSX/platformthreading.mm
@ -106,9 +106,11 @@ public:
            [[NSApplication sharedApplication] activateIgnoringOtherApps:true];
            while(true)
            {
+                if(can != NULL && can->Cancelled)
+                    return;
                NSEvent* ev = [[NSApplication sharedApplication]
                               nextEventMatchingMask:NSEventMaskAny
-                               untilDate: [NSDate distantFuture]
+                               untilDate: [NSDate dateWithTimeIntervalSinceNow:1]
                               inMode:NSDefaultRunLoopMode
                               dequeue:true];
                if(can != NULL && can->Cancelled)