vlc | branch: master | David Fuhrmann <[email protected]> | Sun Sep 3 14:17:10 2017 +0200| [a05cac87ecb7ac8312529f631c6472ccb788c034] | committer: David Fuhrmann
macosx: Fix InputManager cleanup path on application shutdown Makes sure cleanup actions like itunes playback are in correct state. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a05cac87ecb7ac8312529f631c6472ccb788c034 --- modules/gui/macosx/VLCInputManager.m | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/gui/macosx/VLCInputManager.m b/modules/gui/macosx/VLCInputManager.m index d04e3a21a0..35a0b28d5f 100644 --- a/modules/gui/macosx/VLCInputManager.m +++ b/modules/gui/macosx/VLCInputManager.m @@ -258,6 +258,12 @@ static int InputEvent(vlc_object_t *p_this, const char *psz_var, - (void)playbackStatusUpdated { + // On shutdown, input might not be dead yet. Cleanup actions like inhibit, itunes playback + // and playback positon are done in different code paths (dealloc and appWillTerminate:). + if ([[VLCMain sharedInstance] isTerminating]) { + return; + } + intf_thread_t *p_intf = getIntf(); int state = -1; if (p_current_input) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
