From 94aa2248cae85c8843fa7f7fe2887c8d2513d0fa Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 15 Jun 2022 17:31:45 +0900 Subject: [PATCH] Move filter reset to more appropriate location --- .../Dialog/PopupDialogDangerousButton.cs | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs b/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs index 1cf8578852..90ac2d8a08 100644 --- a/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs +++ b/osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs @@ -88,28 +88,24 @@ namespace osu.Game.Overlays.Dialog { if (!e.HasAnyButtonPressed) { + lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF); AbortConfirm(); } } private void progressChanged(ValueChangedEvent progress) { - if (progress.NewValue < progress.OldValue) - { - lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF); - return; - } + if (progress.NewValue < progress.OldValue) return; - if (Clock.CurrentTime - lastTickPlaybackTime >= 30) - { - lowPassFilter.CutoffTo((int)(progress.NewValue * AudioFilter.MAX_LOWPASS_CUTOFF * 0.5)); + if (Clock.CurrentTime - lastTickPlaybackTime < 30) return; - tickSample.Frequency.Value = 1 + progress.NewValue * 0.5f; - tickSample.Volume.Value = 0.5f + progress.NewValue / 2f; - tickSample.Play(); + lowPassFilter.CutoffTo((int)(progress.NewValue * AudioFilter.MAX_LOWPASS_CUTOFF * 0.5)); - lastTickPlaybackTime = Clock.CurrentTime; - } + tickSample.Frequency.Value = 1 + progress.NewValue * 0.5f; + tickSample.Volume.Value = 0.5f + progress.NewValue / 2f; + tickSample.Play(); + + lastTickPlaybackTime = Clock.CurrentTime; } } }