diff --git a/Qwilight/Compute/DefaultCompute.cs b/Qwilight/Compute/DefaultCompute.cs index ce4bb65..330da8a 100644 --- a/Qwilight/Compute/DefaultCompute.cs +++ b/Qwilight/Compute/DefaultCompute.cs @@ -2469,7 +2469,7 @@ if (!IsInEvents) { Utility.LoopBefore(waitAudioNoteMap, LoopingCounter, Configure.Instance.AudioWait + Configure.Instance.BanalAudioWait, handleAudioNotesImpl); - if (!Configure.Instance.HandleInputAudio || Configure.Instance.LevelingInputAudio) + if (!Configure.Instance.HandleInputAudio || (Configure.Instance.LevelingInputAudio && Configure.Instance.CanLevelingInputAudio)) { Utility.LoopBefore(waitInputAudioMap, LoopingCounter, Configure.Instance.AudioWait + Configure.Instance.BanalAudioWait, handleAudioNotesImpl); } diff --git a/Qwilight/System/Configure/Configure.cs b/Qwilight/System/Configure/Configure.cs index 8994cfc..2052d61 100644 --- a/Qwilight/System/Configure/Configure.cs +++ b/Qwilight/System/Configure/Configure.cs @@ -504,6 +504,7 @@ { OnPropertyChanged(nameof(StopLastEqualAudioText)); OnPropertyChanged(nameof(StopLastEqualAudioPaint)); + OnPropertyChanged(nameof(CanLevelingInputAudio)); } } } @@ -1689,6 +1690,7 @@ OnPropertyChanged(nameof(HandleInputAudio)); OnPropertyChanged(nameof(HandleInputAudioPaint)); OnPropertyChanged(nameof(HandleInputAudioText)); + OnPropertyChanged(nameof(CanLevelingInputAudio)); } } @@ -1714,6 +1716,8 @@ public string LevelingInputAudioText => LevelingInputAudio ? LanguageSystem.Instance.LevelingInputAudioText : LanguageSystem.Instance.NotLevelingInputAudioText; + public bool CanLevelingInputAudio => HandleInputAudio && !StopLastEqualAudio; + [JsonIgnore] public double BanalAudioWait { diff --git a/Qwilight/View/ConfigureWindow/AudioConfigureWindow.xaml b/Qwilight/View/ConfigureWindow/AudioConfigureWindow.xaml index e91c676..976855c 100644 --- a/Qwilight/View/ConfigureWindow/AudioConfigureWindow.xaml +++ b/Qwilight/View/ConfigureWindow/AudioConfigureWindow.xaml @@ -64,7 +64,15 @@