diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-02-13 13:01:51 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-02-13 13:01:51 +0100 |
| commit | 20fa191adb3784c853cd005745ca20d16cb906d9 (patch) | |
| tree | 13c899022de559ba40ffc1a31237b40bb62cbc67 /osdep | |
| parent | 55f4b592d1696e270cd9f1ec6ab6e7102c737115 (diff) | |
| download | mpv-20fa191adb3784c853cd005745ca20d16cb906d9.tar.bz2 mpv-20fa191adb3784c853cd005745ca20d16cb906d9.tar.xz | |
cocoa: fix deadlock during initialization
Thanks to @wm4 for catching the bug.
Fixes #405
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/macosx_application.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m index b5da25d60c..aa334514a0 100644 --- a/osdep/macosx_application.m +++ b/osdep/macosx_application.m @@ -323,7 +323,8 @@ int cocoa_main(mpv_main_fn mpv_main, int argc, char *argv[]) pthread_create(&playback_thread_id, NULL, playback_thread, &ctx); [mpv_shared_app().input_ready lock]; - [mpv_shared_app().input_ready wait]; + while (!mpv_shared_app().inputContext) + [mpv_shared_app().input_ready wait]; [mpv_shared_app().input_ready unlock]; cocoa_run_runloop(); |