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

[Felix Abecassis]

vlc/vlc-2.1 | branch: master | Felix Abecassis <felix.abecassis at gmail.com> | Tue Jan 28 10:56:46 2014 +0100| [8e2c9c8cc496042bbe480510836e6a84b465c5c9] | committer: Jean-Baptiste Kempf

hotkeys: fullscreen state of the vout should have precedence over fullscreen state of the playlist

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 at videolan.org>
(cherry picked from commit 9f7bfd93e3a749a2912adda6380370310cd4dffa)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=8e2c9c8cc496042bbe480510836e6a84b465c5c9
---

 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 ec21bec..b358494 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;
         }