[vlc-devel] commit: doVolumeChanges: always return the value ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Feb 14 12:03:47 2010 +0200| [f3544f08ce50d1638b6121948a9879f73aba6bd9] | committer: Rémi Denis-Courmont 

doVolumeChanges: always return the value

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f3544f08ce50d1638b6121948a9879f73aba6bd9
---

 src/audio_output/intf.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c
index 57eefe3..3fadb4f 100644
--- 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;
 }