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

Merge pull request #2533 from peppy/fix-wedge-nullref

Browse Source 
Fix nullref when changing ruleset at main menu
This commit is contained in:
Dean Herbert 2018-05-14 15:19:35 +09:00 committed by GitHub
commit 07fc71e077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -88,17 +88,27 @@ namespace osu.Game.Screens.Select
private void loadBeatmap() private void loadBeatmap()
{ {
void updateState()
{
State = beatmap == null ? Visibility.Hidden : Visibility.Visible;
Info?.FadeOut(250);
Info?.Expire();
}
if (beatmap == null)
{
updateState();
return;
}
LoadComponentAsync(new BufferedWedgeInfo(beatmap, ruleset.Value) LoadComponentAsync(new BufferedWedgeInfo(beatmap, ruleset.Value)
{ {
Shear = -Shear, Shear = -Shear,
Depth = Info?.Depth + 1 ?? 0, Depth = Info?.Depth + 1 ?? 0,
}, newInfo => }, newInfo =>
{ {
State = beatmap == null ? Visibility.Hidden : Visibility.Visible; updateState();
Info?.FadeOut(250);
Info?.Expire();
Add(Info = newInfo); Add(Info = newInfo);
}); });
} }