Browse Source

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

OSX - fix potential deadlock with user code
release/0.9.4
danwalmsley 6 years ago
committed by Dan Walmsley
parent
commit
b996d06522
  1. 7
      native/Avalonia.Native/src/OSX/platformthreading.mm

7
native/Avalonia.Native/src/OSX/platformthreading.mm

@ -157,11 +157,14 @@ NSArray<NSString*>* _modes;
-(void) perform -(void) perform
{ {
ComPtr<IAvnSignaledCallback> cb;
@synchronized (self) { @synchronized (self) {
_signaled = false; _signaled = false;
if(_parent != NULL && _parent->SignaledCallback != NULL) if(_parent != NULL)
_parent->SignaledCallback->Signaled(0, false); cb = _parent->SignaledCallback;
} }
if(cb != nullptr)
cb->Signaled(0, false);
} }
-(void) setParent:(PlatformThreadingInterface *)parent -(void) setParent:(PlatformThreadingInterface *)parent

Loading…
Cancel
Save