RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle potential for `OnResuming` call without an `OnSuspending` first

This commit is contained in:
Dean Herbert 2021-09-16 16:31:41 +09:00
parent b58415fe19
commit 3495fae519
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/OsuScreen.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -179,9 +178,10 @@ public override void OnResuming(IScreen last)
applyArrivingDefaults(true);
Debug.Assert(trackAdjustmentStateAtSuspend != null);
musicController.AllowTrackAdjustments = trackAdjustmentStateAtSuspend.Value;
// it's feasible to resume to a screen if the target screen never loaded successfully.
// in such a case there's no need to restore this value.
if (trackAdjustmentStateAtSuspend != null)
musicController.AllowTrackAdjustments = trackAdjustmentStateAtSuspend.Value;
base.OnResuming(last);
}