diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-12-04 11:46:27 +0100 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-12-04 11:46:27 +0100 |
| commit | 7ec5db7e050505bbcb04a70edacec4075389a2df (patch) | |
| tree | ca842f2e33bd8ee264a58db2c7e08bfcf8a555a4 /src/service.vala | |
| parent | c61e4c4f2c5e24f374c0d6e3c90c318443403c94 (diff) | |
| download | ayatana-indicator-sound-7ec5db7e050505bbcb04a70edacec4075389a2df.tar.gz ayatana-indicator-sound-7ec5db7e050505bbcb04a70edacec4075389a2df.tar.bz2 ayatana-indicator-sound-7ec5db7e050505bbcb04a70edacec4075389a2df.zip | |
Setting user selected volume when pressing OK in the high volume dialog
Diffstat (limited to 'src/service.vala')
| -rw-r--r-- | src/service.vala | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/service.vala b/src/service.vala index 923aba2..312fec5 100644 --- a/src/service.vala +++ b/src/service.vala @@ -629,11 +629,13 @@ public class IndicatorSound.Service: Object { warn_notification.add_action ("ok", _("OK"), (n, a) => { stop_clamp_to_high_timeout(); volume_control.approve_high_volume (); - if (_pre_warn_volume != null) { - var tmp = _pre_warn_volume; - _pre_warn_volume = null; - volume_control.volume = tmp; - } + // restore the volume the user introduced + VolumeControl.Volume vol = new VolumeControl.Volume(); + vol.volume = volume_control.get_pre_clamped_volume(); + vol.reason = VolumeControl.VolumeReasons.USER_KEYPRESS; + _pre_warn_volume = null; + volume_control.volume = vol; + waiting_user_approve_warn = false; }); warn_notification.add_action ("cancel", _("Cancel"), (n, a) => { |