From 5ce1ac75d42ba981b04bb50ec0b0fadac0b22a65 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Fri, 29 May 2009 13:53:13 +0200 Subject: [PATCH] macosx vout: fix fullscreen behaviour on eof. Fixes a bug introduced on [795fa06c631752687800bdff5ec44f742c0e72bd] Closes #2794 (cherry picked from commit fc9987fa29409be3cae9743dbae265959477747c) Signed-off-by: Jean-Baptiste Kempf --- modules/gui/macosx/voutgl.m | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/modules/gui/macosx/voutgl.m b/modules/gui/macosx/voutgl.m index 7f88fe2b34..a6e751d8bd 100644 --- a/modules/gui/macosx/voutgl.m +++ b/modules/gui/macosx/voutgl.m @@ -211,38 +211,24 @@ void CloseVideoGL ( vlc_object_t * p_this ) msg_Dbg( p_this, "Closing" ); #ifndef __x86_64__ - /* If the fullscreen window is still open, close it */ - if( p_vout->b_fullscreen ) + if( p_vout->p_sys->b_embedded ) { - p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; - if( p_vout->p_sys->b_embedded ) + /* If the fullscreen window is still open, close it */ + if( p_vout->b_fullscreen ) { + p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; aglManage( p_vout ); var_SetBool( p_vout->p_parent, "fullscreen", false ); } - else - Manage( p_vout ); - } - - if( p_vout->p_sys->b_embedded ) - { if( p_vout->p_sys->agl_ctx ) { aglEnd( p_vout ); aglDestroyContext(p_vout->p_sys->agl_ctx); } } - else if(VLCIntf && vlc_object_alive (VLCIntf)) - { - NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; - - /* Close the window */ - [p_vout->p_sys->o_vout_view performSelectorOnMainThread:@selector(closeVout) withObject:NULL waitUntilDone:YES]; - - [o_pool release]; - } -#else - if(VLCIntf && vlc_object_alive (VLCIntf)) + else +#endif + if(VLCIntf && vlc_object_alive (VLCIntf)) { NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; @@ -251,7 +237,6 @@ void CloseVideoGL ( vlc_object_t * p_this ) [o_pool release]; } -#endif /* Clean up */ free( p_vout->p_sys ); } -- 2.39.2