hotkeys: fix wall-paper toggling

2f846d8c · Rémi Denis-Courmont · ecbfb0f2 · 2f846d8c
Commit 2f846d8c authored Jan 05, 2014 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

modules/control/hotkeys.c modules/control/hotkeys.c +4 -4

No files found.
--- 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)
+            bool wp = var_ToggleBool( p_playlist, "video-wallpaper" );
-                                       : VLC_OBJECT(p_playlist);
+            if( p_vout )
-            var_ToggleBool( obj, "video-wallpaper" );
+                var_SetBool( p_vout, "video-wallpaper", wp );
            break;
        }