diff options
| author | charles kerr <charlesk@canonical.com> | 2015-12-19 17:56:59 -0600 |
|---|---|---|
| committer | charles kerr <charlesk@canonical.com> | 2015-12-19 17:56:59 -0600 |
| commit | 6aa814370aab377943bd109875e8c0ae1bdcdab9 (patch) | |
| tree | b305d4784f5edf69dba328fb14c5a57f41e9e4a3 /src/service.vala | |
| parent | 4b695bacf20b7247f6b16483ede5e5d8b51dd355 (diff) | |
| download | ayatana-indicator-sound-6aa814370aab377943bd109875e8c0ae1bdcdab9.tar.gz ayatana-indicator-sound-6aa814370aab377943bd109875e8c0ae1bdcdab9.tar.bz2 ayatana-indicator-sound-6aa814370aab377943bd109875e8c0ae1bdcdab9.zip | |
move loudness warning's enabled & decibels from volume-control-pulse to options
Diffstat (limited to 'src/service.vala')
| -rw-r--r-- | src/service.vala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/service.vala b/src/service.vala index 3ff7ffb..c94deb2 100644 --- a/src/service.vala +++ b/src/service.vala @@ -620,10 +620,10 @@ public class IndicatorSound.Service: Object { && this.notify_server_supports_actions && !this.volume_control.high_volume_approved && !ignore_warning_this_time; - if (waiting_user_approve_warn && volume_control.below_warning_volume) { + if (waiting_user_approve_warn && !_options.is_loud(volume_control.volume)) { volume_control.set_warning_volume(); close_notification(warn_notification); - } + } if (warn) { close_notification(info_notification); if (_pre_warn_volume == null) { @@ -641,7 +641,7 @@ public class IndicatorSound.Service: Object { 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) => { |