Merge pull request #12579 from de1acr0ix/fix-mainloop-cancellation-hang

Fix UI thread main loop cancellation from another thread on macOS
AvaloniaUI · Aug 18, 2023 · 0b6294e · 0b6294e
2 parents c59e63e + f895661
commit 0b6294e
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/native/Avalonia.Native/src/OSX/platformthreading.mm b/native/Avalonia.Native/src/OSX/platformthreading.mm
@@ -17,7 +17,6 @@ virtual void Cancel() override
         Cancelled = true;
         if(Running)
         {
-            Running = false;
             if(![NSThread isMainThread])
             {
                 AddRef();
@@ -28,22 +27,22 @@ virtual void Cancel() override
                 });
                 return;
             };
+
+            Running = false;
             if(IsApp)
                 [NSApp stop:nil];
-            else
-            {
-                // Wakeup the event loop
-                NSEvent* event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
-                                                    location:NSMakePoint(0, 0)
-                                               modifierFlags:0
-                                                   timestamp:0
-                                                windowNumber:0
-                                                     context:nil
-                                                     subtype:0
-                                                       data1:0
-                                                       data2:0];
-                [NSApp postEvent:event atStart:YES];
-            }
+
+            // Wakeup the event loop
+            NSEvent* event = [NSEvent otherEventWithType:NSEventTypeApplicationDefined
+                                                location:NSMakePoint(0, 0)
+                                            modifierFlags:0
+                                                timestamp:0
+                                            windowNumber:0
+                                                    context:nil
+                                                    subtype:0
+                                                    data1:0
+                                                    data2:0];
+            [NSApp postEvent:event atStart:YES];
         }
     };
 };