From 3c989a21730c83883ea45671df2f579f6d430dd1 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sat, 17 Nov 2018 13:18:53 +0300
Subject: [PATCH] Fixed some OS threading issues

---
 native/Avalonia.Native/src/OSX/main.mm   | 24 ++++++++++--------------
 native/Avalonia.Native/src/OSX/window.mm |  4 +++-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm
index 4d6dcfed85..5043246c53 100644
--- a/native/Avalonia.Native/src/OSX/main.mm
+++ b/native/Avalonia.Native/src/OSX/main.mm
@@ -32,27 +32,23 @@ public:
 - (void) do;
 @end
 @implementation ThreadingInitializer
-
-pthread_mutex_t mutex;
-pthread_cond_t cond;
-
+{
+    int _fds[2];
+}
 - (void) runOnce
 {
-    pthread_mutex_lock(&mutex);
-    pthread_cond_signal(&cond);
-    pthread_mutex_unlock(&mutex);
+    char buf[]={0};
+    write(_fds[1], buf, 1);
 }
 
 - (void) do
 {
-    pthread_mutex_init(&mutex, NULL);
-    pthread_cond_init(&cond, NULL);
+    pipe(_fds);
     [[[NSThread alloc] initWithTarget:self selector:@selector(runOnce) object:nil] start];
-    pthread_mutex_lock(&mutex);
-    pthread_cond_wait(&cond, &mutex);
-    pthread_mutex_unlock(&mutex);
-    pthread_cond_destroy(&cond);
-    pthread_mutex_destroy(&mutex);
+    char buf[1];
+    read(_fds[0], buf, 1);
+    close(_fds[0]);
+    close(_fds[1]);
 }
 
 
diff --git a/native/Avalonia.Native/src/OSX/window.mm b/native/Avalonia.Native/src/OSX/window.mm
index 6a8043f39a..ae00bde780 100644
--- a/native/Avalonia.Native/src/OSX/window.mm
+++ b/native/Avalonia.Native/src/OSX/window.mm
@@ -1113,7 +1113,9 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
         [self restoreParentWindow];
         parent->BaseEvents->Closed();
         [parent->View onClosed];
-        [self setContentView: nil];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self setContentView: nil];
+        });
     }
 }