Only attempt to restore CurrentItem state if present

This commit is contained in:
Jamie Taylor 2019-03-07 14:09:28 +09:00
parent 00cdb3a44a
commit e13516c2ba
No known key found for this signature in database
GPG Key ID: 2ACFA8B6370B8C8C
1 changed files with 6 additions and 3 deletions

View File

@ -60,9 +60,12 @@ public override bool OnExiting(IScreen next)
if (base.OnExiting(next))
return true;
Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value?.Beatmap);
Beatmap.Value.Mods.Value = selectedMods.Value = CurrentItem.Value?.RequiredMods;
Ruleset.Value = CurrentItem.Value?.Ruleset;
if (CurrentItem.Value != null)
{
Ruleset.Value = CurrentItem.Value.Ruleset;
Beatmap.Value = beatmaps.GetWorkingBeatmap(CurrentItem.Value.Beatmap);
Beatmap.Value.Mods.Value = selectedMods.Value = CurrentItem.Value.RequiredMods;
}
Beatmap.Disabled = true;
Ruleset.Disabled = true;