sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

No more statics + better unregistration

Browse Source
This commit is contained in:
smoogipoo
2018-01-18 17:40:05 +09:00
parent 89f4bfa7b5
commit dee298c395
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,7 @@ namespace osu.Game.Rulesets.UI
protected readonly Ruleset Ruleset;
private IRulesetConfigManager rulesetConfig;
private OnScreenDisplay onScreenDisplay;
private DependencyContainer dependencies;
@ -89,23 +90,17 @@ namespace osu.Game.Rulesets.UI
[BackgroundDependencyLoader]
private void load(Storage storage, OnScreenDisplay onScreenDisplay)
{
rulesetConfig = getConfig(storage);
this.onScreenDisplay = onScreenDisplay;
rulesetConfig = CreateConfig(Ruleset, storage);
if (rulesetConfig != null)
{
dependencies.Cache(rulesetConfig);
onScreenDisplay?.Register(rulesetConfig);
onScreenDisplay?.Register(this, rulesetConfig);
}
}
private static readonly Dictionary<Type, IRulesetConfigManager> config_cache = new Dictionary<Type, IRulesetConfigManager>();
private IRulesetConfigManager getConfig(Storage storage)
{
if (config_cache.TryGetValue(GetType(), out var existing))
return existing;
return config_cache[GetType()] = CreateConfig(Ruleset, storage);
}
public abstract ScoreProcessor CreateScoreProcessor();
/// <summary>
@ -148,7 +143,12 @@ namespace osu.Game.Rulesets.UI
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
rulesetConfig.Save();
if (rulesetConfig != null)
{
onScreenDisplay?.Unregister(this, rulesetConfig);
rulesetConfig = null;
}
}
}