summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2014-02-13 22:22:44 +0100
committerwm4 <wm4@nowhere>2014-03-11 00:04:15 +0100
commit229d398ba941e13b755e96acc9b624bfbf48c14d (patch)
tree70574c7e100a8c55fe97df926fc4f6fbb14ffb26
parent5f1b155307685b908d86c85a013215b3375d591b (diff)
downloadmpv-229d398ba941e13b755e96acc9b624bfbf48c14d.tar.bz2
mpv-229d398ba941e13b755e96acc9b624bfbf48c14d.tar.xz
cocoa: fix deadlock during initialization [2]
Fixup commit for 20fa191ad.
-rw-r--r--osdep/macosx_application.m9
1 files 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)