* control/hotkeys.c: Fix Play/Pause hotkey

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 9b1c321d958e8faa4ca9ff52b6080244741b361f..ea7c7e5a88b0a37b47c04fc5c61761a13dbd57bf 100644 (file)
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -339,15 +339,22 @@ static void Run( intf_thread_t *p_intf )
         {
             val.i_int = PLAYING_S;
             if( p_input )
-            {
-                var_Get( p_input, "state", &val );
-            }
-            if( p_input && val.i_int != PAUSE_S )
             {
                 ClearChannels( p_intf, p_vout );
-                vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
-                              OSD_PAUSE_ICON );
-                val.i_int = PAUSE_S;
+
+                var_Get( p_input, "state", &val );
+                if( val.i_int != PAUSE_S )
+                {
+                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+                                  OSD_PAUSE_ICON );
+                    val.i_int = PAUSE_S;
+                }
+                else
+                {
+                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
+                                  OSD_PLAY_ICON );
+                    val.i_int = PLAYING_S;
+                }
                 var_Set( p_input, "state", val );
             }
             else
@@ -356,9 +363,6 @@ static void Run( intf_thread_t *p_intf )
                                               FIND_ANYWHERE );
                 if( p_playlist )
                 {
-                    ClearChannels( p_intf, p_vout );
-                    vout_OSDIcon( VLC_OBJECT( p_intf ), DEFAULT_CHAN,
-                                  OSD_PLAY_ICON );
                     playlist_Play( p_playlist );
                     vlc_object_release( p_playlist );
                 }