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

Explicitly handle null settings case + add annotations

Browse Source
This commit is contained in:
smoogipoo 2018-06-11 12:57:56 +09:00
parent b219c17115
commit 63ec36b3be
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Rulesets/UI/RulesetContainer.cs
View File

@ -13,6 +13,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Input; using osu.Framework.Input;
@ -86,10 +87,12 @@ namespace osu.Game.Rulesets.UI
} }
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(OnScreenDisplay onScreenDisplay, SettingsStore settings) private void load([CanBeNull] OnScreenDisplay onScreenDisplay, [CanBeNull] SettingsStore settings)
{ {
this.onScreenDisplay = onScreenDisplay; this.onScreenDisplay = onScreenDisplay;
if (settings != null)
{
rulesetConfig = CreateConfig(Ruleset, settings); rulesetConfig = CreateConfig(Ruleset, settings);
if (rulesetConfig != null) if (rulesetConfig != null)
@ -98,6 +101,7 @@ namespace osu.Game.Rulesets.UI
onScreenDisplay?.BeginTracking(this, rulesetConfig); onScreenDisplay?.BeginTracking(this, rulesetConfig);
} }
} }
}
private DependencyContainer dependencies; private DependencyContainer dependencies;