h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 17:53:21 +08:00
Code Issues Releases Wiki Activity

Fix a couple of oversights regarding track nullability

Browse Source
This commit is contained in:
Dean Herbert 2022-08-25 14:45:00 +09:00
parent ec60e16439
commit ad3dd1c700
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -146,6 +146,7 @@ namespace osu.Game.Beatmaps
/// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called. /// Get the loaded audio track instance. <see cref="LoadTrack"/> must have first been called.
/// This generally happens via MusicController when changing the global beatmap. /// This generally happens via MusicController when changing the global beatmap.
/// </summary> /// </summary>
[NotNull]
public Track Track public Track Track
{ {
get get

14
osu.Game/Screens/Play/FailAnimation.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
private Box redFlashLayer = null!; private Box redFlashLayer = null!;
private Track? track; private Track track = null!;
private AudioFilter failLowPassFilter = null!; private AudioFilter failLowPassFilter = null!;
private AudioFilter failHighPassFilter = null!; private AudioFilter failHighPassFilter = null!;
@ -153,15 +153,17 @@ namespace osu.Game.Screens.Play
public void RemoveFilters(bool resetTrackFrequency = true) public void RemoveFilters(bool resetTrackFrequency = true)
{ {
if (filtersRemoved) if (filtersRemoved) return;
return;
filtersRemoved = true; filtersRemoved = true;
if (resetTrackFrequency) if (!started)
track?.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq); return;
track?.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment); if (resetTrackFrequency)
track.RemoveAdjustment(AdjustableProperty.Frequency, trackFreq);
track.RemoveAdjustment(AdjustableProperty.Volume, volumeAdjustment);
if (filters.Parent == null) if (filters.Parent == null)
return; return;