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

Merge remote-tracking branch 'upstream/master' into cmc-rooms

Browse Source
This commit is contained in:
Dean Herbert
2019-02-08 18:45:39 +09:00
parent f52cac966b 7ec0b4ba77
commit a30d3739cf
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Multi/Match/Components/ReadyButton.cs
View File

@ -55,6 +55,9 @@ namespace osu.Game.Screens.Multi.Match.Components
private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent) private void beatmapAdded(BeatmapSetInfo model, bool existing, bool silent)
{ {
if (Beatmap.Value == null)
return;
if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID)) if (model.Beatmaps.Any(b => b.OnlineBeatmapID == Beatmap.Value.OnlineBeatmapID))
Schedule(() => hasBeatmap = true); Schedule(() => hasBeatmap = true);
} }

2
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -242,7 +242,7 @@ namespace osu.Game.Screens.Multi
private void cancelLooping() private void cancelLooping()
{ {
var track = beatmap.Value.Track; var track = beatmap?.Value?.Track;
if (track != null) if (track != null)
track.Looping = false; track.Looping = false;
} }