summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-16 13:57:41 +0200
committerStefano Pigozzi <stefano.pigozzi@gmail.com>2014-10-16 22:53:08 +0200
commita0ac8b6331d345748d415cf71affbe7a90e336a6 (patch)
treeab00bee3484998dca6a5480d56bf70d77f6ef10a
parent63f103e05d4c72a1fa32c4adb5e288a58c5c9603 (diff)
downloadmpv-a0ac8b6331d345748d415cf71affbe7a90e336a6.tar.bz2
mpv-a0ac8b6331d345748d415cf71affbe7a90e336a6.tar.xz
cocoa: perform init and uninit synchronously
This is slightly safer and without the resize redraw, should not cause any deadlock.
-rw-r--r--video/out/cocoa_common.m4
1 files changed, 1 insertions, 3 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 537388ffd9..655c740169 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -95,9 +95,7 @@ static void with_cocoa_lock(struct vo *vo, void(^block)(void))
static void with_cocoa_lock_on_main_thread(struct vo *vo, void(^block)(void))
{
- dispatch_async(dispatch_get_main_queue(), ^{
- with_cocoa_lock(vo, block);
- });
+ dispatch_sync(dispatch_get_main_queue(), block);
}
static void queue_new_video_size(struct vo *vo, int w, int h)