sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-17 11:37:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1055 from tgi74/master

Browse Source 
Fixed various exceptions when no beatmaps are imported
This commit is contained in:
Dean Herbert 2017-07-25 09:37:30 +09:00 committed by GitHub
commit 1c501df83c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -178,6 +178,9 @@ namespace osu.Game.Screens.Select
public void SelectNextRandom() public void SelectNextRandom()
{ {
if (groups.Count == 0)
return;
randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel)); randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
var visibleGroups = getVisibleGroups(); var visibleGroups = getVisibleGroups();
@ -311,6 +314,9 @@ namespace osu.Game.Screens.Select
private void removeGroup(BeatmapGroup group) private void removeGroup(BeatmapGroup group)
{ {
if (group == null)
return;
groups.Remove(group); groups.Remove(group);
panels.Remove(group.Header); panels.Remove(group.Header);
foreach (var p in group.BeatmapPanels) foreach (var p in group.BeatmapPanels)

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -384,7 +384,7 @@ namespace osu.Game.Screens.Select
private void promptDelete() private void promptDelete()
{ {
if (Beatmap != null) if (Beatmap != null && !Beatmap.IsDefault)
dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap)); dialogOverlay?.Push(new BeatmapDeleteDialog(Beatmap));
} }