Commit b57a7089 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

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

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 3a6ce9618b93435f8e8e2b0b3c9310e9752c870f)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent c973882d
...@@ -122,6 +122,17 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps, ...@@ -122,6 +122,17 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps,
( action == TOGGLE_MUTE ) ( 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 */ /* On UnMute */
if ( b_unmute_condition ) if ( b_unmute_condition )
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment