From 229d398ba941e13b755e96acc9b624bfbf48c14d Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Thu, 13 Feb 2014 22:22:44 +0100 Subject: cocoa: fix deadlock during initialization [2] Fixup commit for 20fa191ad. --- osdep/macosx_application.m | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index f047f5f45e..787c6f138e 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -389,13 +389,10 @@ void cocoa_stop_runloop(void) void cocoa_set_input_context(struct input_ctx *input_context) { - if (input_context) { - [mpv_shared_app().input_ready lock]; - [mpv_shared_app().input_ready signal]; - [mpv_shared_app().input_ready unlock]; - } - + [mpv_shared_app().input_ready lock]; mpv_shared_app().inputContext = input_context; + [mpv_shared_app().input_ready signal]; + [mpv_shared_app().input_ready unlock]; } void cocoa_post_fake_event(void) -- cgit v1.2.3