Merge pull request #3613 from AvaloniaUI/osx-potential-deadlock-in-user-code

OSX - fix potential deadlock with user code
6 years ago · b996d06522
1 changed files with 5 additions and 2 deletions
--- a/native/Avalonia.Native/src/OSX/platformthreading.mm
+++ b/native/Avalonia.Native/src/OSX/platformthreading.mm
@ -157,11 +157,14 @@ NSArray<NSString*>* _modes;

 -(void) perform
 {
+    ComPtr<IAvnSignaledCallback> cb;
    @synchronized (self) {
        _signaled  = false;
-        if(_parent != NULL && _parent->SignaledCallback != NULL)
-            _parent->SignaledCallback->Signaled(0, false);
+        if(_parent != NULL)
+            cb = _parent->SignaledCallback;
    }
+    if(cb != nullptr)
+        cb->Signaled(0, false);
 }

 -(void) setParent:(PlatformThreadingInterface *)parent