vlc/vlc-2.0 | branch: master | David Fuhrmann <[email protected]> | Wed Mar 21 15:33:17 2012 +0100| [972873695d48864c7ffa899c0385d36b2203ba4b] | committer: David Fuhrmann
macosx: fix another rare crash on exit (cherry picked from commit bf916c3520997102ff862887065ec38f93efada2) Signed-off-by: David Fuhrmann <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=972873695d48864c7ffa899c0385d36b2203ba4b --- modules/gui/macosx/intf.m | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 414e9fa..91d6424 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -766,6 +766,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_coredialogs release]; [o_eyetv release]; [o_mainwindow release]; + o_mainwindow = NULL; /* unsubscribe from libvlc's debug messages */ vlc_Unsubscribe( p_intf->p_sys->p_sub ); @@ -1705,8 +1706,11 @@ unsigned int CocoaKeyToVLC( unichar i_key ) - (void)setActiveVideoPlayback:(BOOL)b_value { b_active_videoplayback = b_value; - [o_mainwindow performSelectorOnMainThread:@selector(setVideoplayEnabled) withObject: nil waitUntilDone:NO]; - [o_mainwindow performSelectorOnMainThread:@selector(togglePlaylist:) withObject: nil waitUntilDone:NO]; + if( o_mainwindow ) + { + [o_mainwindow performSelectorOnMainThread:@selector(setVideoplayEnabled) withObject:nil waitUntilDone:NO]; + [o_mainwindow performSelectorOnMainThread:@selector(togglePlaylist:) withObject:nil waitUntilDone:NO]; + } } - (BOOL)activeVideoPlayback _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
