diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-02-13 22:22:44 +0100 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-02-13 22:22:44 +0100 |
commit | 2705c667998ac860fc443f282def006fcbb4abe5 (patch) | |
tree | 5c4965ab3afe0d170afacb11b54af1ebf895f518 | |
parent | 098f0c67e630544be6a6f602460904243e283c93 (diff) | |
download | mpv-2705c667998ac860fc443f282def006fcbb4abe5.tar.bz2 mpv-2705c667998ac860fc443f282def006fcbb4abe5.tar.xz |
cocoa: fix deadlock during initialization [2]
Fixup commit for 20fa191ad.
-rw-r--r-- | osdep/macosx_application.m | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index aa334514a0..6c7748080c 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -382,13 +382,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) |