Commit 5ce1ac75 authored by hartman's avatar hartman Committed by Jean-Baptiste Kempf
Browse files

macosx vout: fix fullscreen behaviour on eof.

Fixes a bug introduced on [795fa06c

]
Closes #2794
(cherry picked from commit fc9987fa29409be3cae9743dbae265959477747c)
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 7cec1ea2
......@@ -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 );
}
......
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