h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:42:54 +08:00
Code Issues Releases Wiki Activity

Softly handle errors when no beatmap file exists in archive

Browse Source
This commit is contained in:
smoogipoo 2018-08-24 17:57:39 +09:00
parent 27c151db8f
commit 99574ecad8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -352,9 +352,8 @@ namespace osu.Game.Beatmaps
string mapName = reader.Filenames.FirstOrDefault(f => f.EndsWith(".osu"));
if (string.IsNullOrEmpty(mapName))
{
// Todo: This is temporary for debugging purposes
var files = reader.Filenames.ToList();
throw new InvalidOperationException($"No beatmap files found in this beatmap archive. Files ({files.Count}): {string.Join(", ", files)}");
Logger.Log($"No beatmap files found in the beatmap archive ({reader.Name}). Skipping.");
return null;
}
Beatmap beatmap;

3
osu.Game/Database/ArchiveModelManager.cs
View File

@ -178,7 +178,8 @@ namespace osu.Game.Database
{
try
{
return Import(CreateModel(archive), archive);
var model = CreateModel(archive);
return model == null ? null : Import(model, archive);
}
catch (Exception e)
{