Commit 5ce1ac75 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman Committed by Jean-Baptiste Kempf

macosx vout: fix fullscreen behaviour on eof.

Fixes a bug introduced on [795fa06c]
Closes #2794
(cherry picked from commit fc9987fa)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 7cec1ea2
...@@ -211,38 +211,24 @@ void CloseVideoGL ( vlc_object_t * p_this ) ...@@ -211,38 +211,24 @@ void CloseVideoGL ( vlc_object_t * p_this )
msg_Dbg( p_this, "Closing" ); msg_Dbg( p_this, "Closing" );
#ifndef __x86_64__ #ifndef __x86_64__
/* If the fullscreen window is still open, close it */ if( p_vout->p_sys->b_embedded )
if( p_vout->b_fullscreen )
{ {
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; /* If the fullscreen window is still open, close it */
if( p_vout->p_sys->b_embedded ) if( p_vout->b_fullscreen )
{ {
p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE;
aglManage( p_vout ); aglManage( p_vout );
var_SetBool( p_vout->p_parent, "fullscreen", false ); 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 ) if( p_vout->p_sys->agl_ctx )
{ {
aglEnd( p_vout ); aglEnd( p_vout );
aglDestroyContext(p_vout->p_sys->agl_ctx); aglDestroyContext(p_vout->p_sys->agl_ctx);
} }
} }
else if(VLCIntf && vlc_object_alive (VLCIntf)) else
{ #endif
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; if(VLCIntf && vlc_object_alive (VLCIntf))
/* 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))
{ {
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
...@@ -251,7 +237,6 @@ void CloseVideoGL ( vlc_object_t * p_this ) ...@@ -251,7 +237,6 @@ void CloseVideoGL ( vlc_object_t * p_this )
[o_pool release]; [o_pool release];
} }
#endif
/* Clean up */ /* Clean up */
free( p_vout->p_sys ); free( p_vout->p_sys );
} }
......
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