From 71335183ecff94e3991c1835c301357a8ab27030 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 1 Sep 2013 23:00:52 +0200 Subject: mplayer: fix race condition on uninit with Cocoa NULL out Cocoa's reference to mplayer's input context before deallocating it --- mpvcore/mplayer.c | 4 ++++ 1 file changed, 4 insertions(+) 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); -- cgit v1.2.3