yoz pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=2e043e825d1c22de3be0beddd5db43753fde984e

commit 2e043e825d1c22de3be0beddd5db43753fde984e
Author: Michael Bouchaud <michael.bouch...@ext.actia.fr>
Date:   Thu Feb 23 00:51:33 2017 +0100

    e_client_volume: Don't set client volume to max after a mute.
    
    Don't set client volume to max after a mute and unmute. Just check if the
    volume is within the available limits.
---
 src/bin/e_client_volume.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_client_volume.c b/src/bin/e_client_volume.c
index 187da94..1963648 100644
--- a/src/bin/e_client_volume.c
+++ b/src/bin/e_client_volume.c
@@ -264,8 +264,15 @@ _e_client_volume_update(E_Client *ec)
      {
         ec->volume_min = volume_min;
         ec->volume_max = volume_max;
-        if (count > 0) ec->volume = volume / count;
-        else ec->volume = volume_max;
+        if (count == 0)
+          {
+             if (ec->volume < volume_min)
+               ec->volume = volume_min;
+             if (ec->volume > volume_max)
+               ec->volume = volume_max;
+          }
+        else
+          ec->volume = volume / count;
         ec->mute = mute;
         ec->volume_control_enabled = EINA_TRUE;
      }

-- 


Reply via email to