Commit b37eec6d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

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

parent 5c0c38f4
...@@ -737,6 +737,8 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -737,6 +737,8 @@ static VLCMain *_o_sharedMainInstance = nil;
vlc_object_kill( p_intf->p_libvlc ); vlc_object_kill( p_intf->p_libvlc );
[self setIntf:nil];
/* Go back to Run() and make libvlc exit properly */ /* Go back to Run() and make libvlc exit properly */
if( jmpbuffer ) if( jmpbuffer )
longjmp( jmpbuffer, 1 ); longjmp( jmpbuffer, 1 );
......
...@@ -444,7 +444,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable, ...@@ -444,7 +444,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
- (void)manage - (void)manage
{ {
/* Disable Screensaver, when we're playing something, but allow it on pause */ /* 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; return;
if( VLCIntf->p_sys->i_play_status == PLAYING_S ) if( VLCIntf->p_sys->i_play_status == PLAYING_S )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment