doVolumeChanges: always return the value

This fixes, e.g. garbage OSD display when toggling mute with the hotkey.

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 57eefe3ad3ccc5767ddeda4bd574f2c49e4d8de7..3fadb4fbc319a891ed5e5ba031d376a34f4b75da 100644 (file)
--- a/src/audio_output/intf.c
+++ b/src/audio_output/intf.c
@@ -150,9 +150,6 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps,
             i_volume = AOUT_VOLUME_MIN;
         else
             i_volume = i_new_volume;
-
-        if ( i_return_volume != NULL )
-            *i_return_volume = i_volume;
     }
 
     var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER );
@@ -187,6 +184,8 @@ int doVolumeChanges( unsigned action, vlc_object_t * p_object, int i_nb_steps,
         vlc_object_release( p_aout );
     }
 
+    if ( i_return_volume != NULL )
+         *i_return_volume = i_volume;
     return i_result;
 }