[vlc-devel] [PATCH] hotkeys: fullscreen state of the vout should have precedence over fullscreen state of the playlist

[Felix Abecassis]

Close #10433. Double clicking to toggle to fullscreen mode does not
trigger this code path since 7b8083d228. The state of the playlist was
therefore not in sync with the vout. Pressing the fullscreen hotkey
caused the state of the playlist to be used to set the state of the
vout, thus causing the bug.
---
 modules/control/hotkeys.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index ab68340..1e7fcdf 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -733,9 +733,13 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
 
         case ACTIONID_TOGGLE_FULLSCREEN:
         {
-            bool fs = var_ToggleBool( p_playlist, "fullscreen" );
             if( p_vout )
-                var_SetBool( p_vout, "fullscreen", fs );
+            {
+                bool fs = var_ToggleBool( p_vout, "fullscreen" );
+                var_SetBool( p_playlist, "fullscreen", fs );
+            }
+            else
+                var_ToggleBool( p_playlist, "fullscreen" );
             break;
         }
 
-- 
1.8.3.2