Commit 5e7be2ae authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32 Vout: set fullscreen back before quitting Vout.

This fix the big bug of disappearing of the interface in embedded mode.
(cherry picked from commit 29e96eae)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 56779562
...@@ -267,6 +267,12 @@ static void CloseVideo( vlc_object_t *p_this ) ...@@ -267,6 +267,12 @@ static void CloseVideo( vlc_object_t *p_this )
Direct3DVoutRelease( p_vout ); Direct3DVoutRelease( p_vout );
if( p_vout->b_fullscreen )
{
Win32ToggleFullscreen( p_vout );
msg_Dbg( p_vout, "Quitting fullscreen" );
}
if( p_vout->p_sys->p_event ) if( p_vout->p_sys->p_event )
{ {
vlc_object_detach( p_vout->p_sys->p_event ); vlc_object_detach( p_vout->p_sys->p_event );
......
...@@ -488,7 +488,11 @@ static void CloseVideo( vlc_object_t *p_this ) ...@@ -488,7 +488,11 @@ static void CloseVideo( vlc_object_t *p_this )
{ {
vout_thread_t * p_vout = (vout_thread_t *)p_this; vout_thread_t * p_vout = (vout_thread_t *)p_this;
msg_Dbg( p_vout, "CloseVideo" ); if( p_vout->b_fullscreen )
{
Win32ToggleFullscreen( p_vout );
msg_Dbg( p_vout, "Quitting fullscreen" );
}
if( p_vout->p_sys->p_event ) if( p_vout->p_sys->p_event )
{ {
......
...@@ -220,7 +220,11 @@ static void CloseVideo( vlc_object_t *p_this ) ...@@ -220,7 +220,11 @@ static void CloseVideo( vlc_object_t *p_this )
{ {
vout_thread_t * p_vout = (vout_thread_t *)p_this; vout_thread_t * p_vout = (vout_thread_t *)p_this;
msg_Dbg( p_vout, "closing video" ); if( p_vout->b_fullscreen )
{
Win32ToggleFullscreen( p_vout );
msg_Dbg( p_vout, "Quitting fullscreen" );
}
if( p_vout->p_sys->p_event ) if( p_vout->p_sys->p_event )
{ {
......
...@@ -313,6 +313,12 @@ static void CloseVideo ( vlc_object_t *p_this ) ...@@ -313,6 +313,12 @@ static void CloseVideo ( vlc_object_t *p_this )
{ {
vout_thread_t * p_vout = (vout_thread_t *)p_this; vout_thread_t * p_vout = (vout_thread_t *)p_this;
if( p_vout->b_fullscreen )
{
Win32ToggleFullscreen( p_vout );
msg_Dbg( p_vout, "Quitting fullscreen" );
}
if( p_vout->p_sys->p_event ) if( p_vout->p_sys->p_event )
{ {
vlc_object_detach( p_vout->p_sys->p_event ); vlc_object_detach( p_vout->p_sys->p_event );
......
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