macosx/vout*: fixed a possible segfault on vout close

diff --git a/modules/gui/macosx/vout.h b/modules/gui/macosx/vout.h
index d72b11c8834fec968192647b4d9ec7b107628d16..f2e76de19cfaaa26bc37f641c01f107a05a919ed 100644 (file)
--- a/modules/gui/macosx/vout.h
+++ b/modules/gui/macosx/vout.h
@@ -67,9 +67,10 @@
     int               initDone;
 }
 
-- (id) initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
+- (id)   initWithFrame: (NSRect) frame vout: (vout_thread_t*) p_vout;
 - (void) initTextures;
 - (void) reloadTexture: (int) index;
+- (void) cleanUp;
 
 @end
 

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 940c8e36a15d4b191ad871156d0f87844a60bc26..e87959626db7f6d10183e6ac410ddca67b6f1d1e 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -455,6 +455,11 @@ void E_(CloseVideo) ( vlc_object_t *p_this )
 {       
     vout_thread_t * p_vout = (vout_thread_t *)p_this;     
 
+    if( p_vout->p_sys->i_opengl )
+    {
+        [p_vout->p_sys->o_glview cleanUp];
+    }
+
     if( CoDestroyWindow( p_vout ) )
     {
         msg_Err( p_vout, "unable to destroy window" );
@@ -1588,6 +1593,11 @@ CATCH_MOUSE_EVENTS
             p_vout->p_sys->p_data[index] );
 }
 
+- (void) cleanUp
+{
+    initDone = 0;
+}
+
 - (void) drawQuad
 {
     glBegin( GL_QUADS );