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

Fix some nullrefs when running visualtests with no maps loaded.

Browse Source
This commit is contained in:
Dean Herbert 2017-01-24 16:01:49 +09:00
parent d17bef12b6
commit 162e183b36
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -29,7 +29,9 @@ namespace osu.Desktop.VisualTests.Tests
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(BeatmapDatabase db) private void load(BeatmapDatabase db)
{ {
beatmap = db.GetWorkingBeatmap(db.Query<BeatmapInfo>().Where(b => b.Mode == PlayMode.Osu).FirstOrDefault()); var beatmapInfo = db.Query<BeatmapInfo>().Where(b => b.Mode == PlayMode.Osu).FirstOrDefault();
if (beatmapInfo != null)
beatmap = db.GetWorkingBeatmap(beatmapInfo);
} }
public override void Reset() public override void Reset()

3
osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
View File

@ -18,7 +18,8 @@ namespace osu.Game.Beatmaps.Drawables
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGameBase game) private void load(OsuGameBase game)
{ {
Texture = working.Background; if (working.Background != null)
Texture = working.Background;
} }
} }
} }

2
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -30,6 +30,8 @@ namespace osu.Game.Beatmaps
{ {
if (background != null) return background; if (background != null) return background;
if (BeatmapInfo.Metadata?.BackgroundFile == null) return null;
try try
{ {
using (var reader = GetReader()) using (var reader = GetReader())

4
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
View File

@ -56,8 +56,8 @@ namespace osu.Game.Modes.Objects.Drawables
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
string hitType = (HitObject.Sample.Type == SampleType.None ? SampleType.Normal : HitObject.Sample.Type).ToString().ToLower(); string hitType = ((HitObject.Sample?.Type ?? SampleType.None) == SampleType.None ? SampleType.Normal : HitObject.Sample.Type).ToString().ToLower();
string sampleSet = HitObject.Sample.Set.ToString().ToLower(); string sampleSet = (HitObject.Sample?.Set ?? SampleSet.Normal).ToString().ToLower();
sample = audio.Sample.Get($@"Gameplay/{sampleSet}-hit{hitType}"); sample = audio.Sample.Get($@"Gameplay/{sampleSet}-hit{hitType}");
} }