macosx: Make sure VLCIntf gets NULL-ify when VLC ends.

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 0252547e99b919c06f63123eee9a143d8ac275fd..7274687d0e707aef13b0a0e8186020e3ece05a5e 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -737,6 +737,8 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     vlc_object_kill( p_intf->p_libvlc );
 
+    [self setIntf:nil];
+
     /* Go back to Run() and make libvlc exit properly */
     if( jmpbuffer )
         longjmp( jmpbuffer, 1 );

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 3d309fce246b5f87a85d4fefff8ff837cb45933c..5858ca668b6f60b84c8fa1f2a3e118491b2334c8 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -444,7 +444,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
 - (void)manage
 {
     /* Disable Screensaver, when we're playing something, but allow it on pause */
-    if( !VLCIntf || !VLCIntf->p_sys || !VLCIntf->p_sys->i_play_status )
+    if( !VLCIntf || !VLCIntf->p_sys )
         return;
 
     if( VLCIntf->p_sys->i_play_status == PLAYING_S )