diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-09-01 23:00:52 +0200 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2013-09-01 23:03:51 +0200 |
commit | 71335183ecff94e3991c1835c301357a8ab27030 (patch) | |
tree | 24888da3d566debf4fefa714aab21d3bfb6084cc /mpvcore | |
parent | 3e1115569e789104269a691237b3f563963aba4b (diff) | |
download | mpv-71335183ecff94e3991c1835c301357a8ab27030.tar.bz2 mpv-71335183ecff94e3991c1835c301357a8ab27030.tar.xz |
mplayer: fix race condition on uninit with Cocoa
NULL out Cocoa's reference to mplayer's input context before deallocating it
Diffstat (limited to 'mpvcore')
-rw-r--r-- | mpvcore/mplayer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mpvcore/mplayer.c b/mpvcore/mplayer.c index 43a7b5d9b0..b1fb55dc87 100644 --- a/mpvcore/mplayer.c +++ b/mpvcore/mplayer.c @@ -565,6 +565,10 @@ static MP_NORETURN void exit_player(struct MPContext *mpctx, timeEndPeriod(1); #endif +#ifdef CONFIG_COCOA + cocoa_set_input_context(NULL); +#endif + mp_input_uninit(mpctx->input); osd_free(mpctx->osd); |