[vlc-devel] commit: macosx: Make sure VLCIntf gets NULL-ify when VLC ends. (Pierre d' Herbemont )
git version control
git at videolan.org
Sat Aug 23 19:53:06 CEST 2008
vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Sat Aug 23 19:56:09 2008 +0200| [b37eec6d280d86ff4876b0d4f148cd7a1ee55d14] | committer: Pierre d'Herbemont
macosx: Make sure VLCIntf gets NULL-ify when VLC ends.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b37eec6d280d86ff4876b0d4f148cd7a1ee55d14
---
modules/gui/macosx/intf.m | 2 ++
modules/gui/macosx/vout.m | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 0252547..7274687 100644
--- 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 3d309fc..5858ca6 100644
--- 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 )
More information about the vlc-devel
mailing list