sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-08 00:53:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix attempt to change ruleset/beatmap bindables while screen is not active

Browse Source
This commit is contained in:
Dean Herbert
2020-10-28 22:50:45 +09:00
parent 25ab3a5fea
commit 5d02de29ca
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Screens/Play/Spectator.cs
View File

@ -63,6 +63,11 @@ namespace osu.Game.Screens.Play
private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated; private IBindable<WeakReference<BeatmapSetInfo>> managerUpdated;
/// <summary>
/// Becomes true if a new state is waiting to be loaded (while this screen was not active).
/// </summary>
private bool newStatePending;
public Spectator([NotNull] User targetUser) public Spectator([NotNull] User targetUser)
{ {
this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser)); this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
@ -162,7 +167,21 @@ namespace osu.Game.Screens.Play
this.state = state; this.state = state;
if (this.IsCurrentScreen())
Schedule(attemptStart); Schedule(attemptStart);
else
newStatePending = true;
}
public override void OnResuming(IScreen last)
{
base.OnResuming(last);
if (newStatePending)
{
attemptStart();
newStatePending = false;
}
} }
private void userFinishedPlaying(int userId, SpectatorState state) private void userFinishedPlaying(int userId, SpectatorState state)