From 0d62ffd891005101f90d067c0495016663b30dbd Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 1 Oct 2008 23:29:09 -0700
Subject: [PATCH] Win32 Vout: after the previous fix of Win32 Vout, the
 fullscreen mode wasn't kept for the next item. This fixes that.

---
 modules/video_output/msw/direct3d.c | 4 +++-
 modules/video_output/msw/directx.c  | 4 +++-
 modules/video_output/msw/glwin32.c  | 4 +++-
 modules/video_output/msw/wingdi.c   | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index ea02a4d515..8e1c07f3f6 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -270,8 +270,10 @@ static void CloseVideo( vlc_object_t *p_this )
 
     if( p_vout->b_fullscreen )
     {
-        Win32ToggleFullscreen( p_vout );
         msg_Dbg( p_vout, "Quitting fullscreen" );
+        Win32ToggleFullscreen( p_vout );
+        /* Force fullscreen in the core for the next video */
+        var_SetBool( p_vout, "fullscreen", true );
     }
 
     if( p_vout->p_sys->p_event )
diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index 043c4a8596..4720f98b32 100644
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -490,8 +490,10 @@ static void CloseVideo( vlc_object_t *p_this )
 
     if( p_vout->b_fullscreen )
     {
-        Win32ToggleFullscreen( p_vout );
         msg_Dbg( p_vout, "Quitting fullscreen" );
+        Win32ToggleFullscreen( p_vout );
+        /* Force fullscreen in the core for the next video */
+        var_SetBool( p_vout, "fullscreen", true );
     }
 
     if( p_vout->p_sys->p_event )
diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index bf49e2b40d..c0fd6c080b 100644
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -222,8 +222,10 @@ static void CloseVideo( vlc_object_t *p_this )
 
     if( p_vout->b_fullscreen )
     {
-        Win32ToggleFullscreen( p_vout );
         msg_Dbg( p_vout, "Quitting fullscreen" );
+        Win32ToggleFullscreen( p_vout );
+        /* Force fullscreen in the core for the next video */
+        var_SetBool( p_vout, "fullscreen", true );
     }
 
     if( p_vout->p_sys->p_event )
diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index 874ed302e6..251e55f1c3 100644
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -315,8 +315,10 @@ static void CloseVideo ( vlc_object_t *p_this )
 
     if( p_vout->b_fullscreen )
     {
-        Win32ToggleFullscreen( p_vout );
         msg_Dbg( p_vout, "Quitting fullscreen" );
+        Win32ToggleFullscreen( p_vout );
+        /* Force fullscreen in the core for the next video */
+        var_SetBool( p_vout, "fullscreen", true );
     }
 
     if( p_vout->p_sys->p_event )
-- 
2.11.4.GIT