]> git.sesse.net Git - vlc/commitdiff
hotkeys: fullscreen state of the vout should have precedence over fullscreen state...
authorFelix Abecassis <felix.abecassis@gmail.com>
Tue, 28 Jan 2014 09:56:46 +0000 (10:56 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Tue, 28 Jan 2014 19:20:57 +0000 (20:20 +0100)
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.

Close #10433.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/control/hotkeys.c

index ab68340cfdd53bf501839ea1534036e479442f28..1e7fcdfceeff66e1ae4da41f93699806fb60086b 100644 (file)
@@ -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;
         }