From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Tue, 8 Jun 2010 23:13:56 +0000 (+0200)
Subject: Ignore unmute if volume hasn't been set or muted. fixes #3636
X-Git-Tag: 1.2.0-pre1~6256
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3a6ce9618b93435f8e8e2b0b3c9310e9752c870f;p=vlc

Ignore unmute if volume hasn't been set or muted. fixes #3636

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index f7c0f489e6..493ad5c71b 100644
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -122,6 +122,17 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps,
                         ( action == TOGGLE_MUTE )
                     ));
 
+    /* If muting or unmuting when play hasn't started */
+    if ( action == SET_MUTE && !b_unmute_condition && !b_mute_condition )
+    {
+        if ( p_aout )
+        {
+            aout_unlock_volume( p_aout );
+            vlc_object_release( p_aout );
+        }
+        return i_result;
+    }
+
     /* On UnMute */
     if ( b_unmute_condition )
     {