Updating branch refs/heads/master to d87694483f47d69bd52320b125e5db85f9481cd4 (commit) from 2a898d0ed8474a8258be4f9d384575d84b412474 (commit)
commit d87694483f47d69bd52320b125e5db85f9481cd4 Author: Guido Berhoerster <guido+x...@berhoerster.name> Date: Wed Dec 26 18:40:23 2012 +0100 Do not assume a minimum volume of 0 in the keyboard shortcut handling panel-plugin/xfce-mixer-plugin.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panel-plugin/xfce-mixer-plugin.c b/panel-plugin/xfce-mixer-plugin.c index bc3f353..7600cb2 100644 --- a/panel-plugin/xfce-mixer-plugin.c +++ b/panel-plugin/xfce-mixer-plugin.c @@ -1076,13 +1076,13 @@ xfce_mixer_plugin_volume_key_pressed (const char *keystring, xfce_mixer_plugin_set_volume (mixer_plugin, new_volume); xfce_mixer_plugin_update_volume (mixer_plugin, new_volume); - /* Mute when volume reaches 0%, unmute if volume is raised from 0% */ - if (old_volume > 0 && new_volume == 0) + /* Mute when volume reaches the minimum, unmute if volume is raised from the minimum */ + if (old_volume > mixer_plugin->track->min_volume && new_volume == mixer_plugin->track->min_volume) { xfce_mixer_plugin_set_muted (mixer_plugin, TRUE); xfce_mixer_plugin_update_muted (mixer_plugin, TRUE); } - else if (old_volume == 0 && new_volume > 0) + else if (old_volume == mixer_plugin->track->min_volume && new_volume > mixer_plugin->track->min_volume) { xfce_mixer_plugin_set_muted (mixer_plugin, FALSE); xfce_mixer_plugin_update_muted (mixer_plugin, FALSE); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits