[vlc-commits] hotkeys: fix wall-paper toggling

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan  5 12:14:51 2014 +0200| [2f846d8c8e95a1d0ea2abebd44153eef3801e07e] | committer: Rémi Denis-Courmont

hotkeys: fix wall-paper toggling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2f846d8c8e95a1d0ea2abebd44153eef3801e07e
---

 modules/control/hotkeys.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index ec21bec..ab68340 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -369,10 +369,10 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
 
         /* Playlist + video output actions */
         case ACTIONID_WALLPAPER:
-        {   /* FIXME: this is invalid if not using DirectX output!!! */
-            vlc_object_t *obj = p_vout ? VLC_OBJECT(p_vout)
-                                       : VLC_OBJECT(p_playlist);
-            var_ToggleBool( obj, "video-wallpaper" );
+        {
+            bool wp = var_ToggleBool( p_playlist, "video-wallpaper" );
+            if( p_vout )
+                var_SetBool( p_vout, "video-wallpaper", wp );
             break;
         }