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

Merge pull request #6010 from peppy/fix-config-disposal

Browse Source 
Dispose config managers ahead of time to avoid database errors
This commit is contained in:
Dan Balasescu
2019-09-06 11:24:54 +09:00
committed by GitHub
parent 9d0151f19f d6cdde552d
commit d1f04639fc
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/OsuGameBase.cs
View File

@ -207,6 +207,7 @@ namespace osu.Game
FileStore.Cleanup(); FileStore.Cleanup();
AddInternal(API); AddInternal(API);
AddInternal(RulesetConfigCache);
GlobalActionContainer globalBinding; GlobalActionContainer globalBinding;

9
osu.Game/Rulesets/RulesetConfigCache.cs
View File

@ -36,5 +36,14 @@ namespace osu.Game.Rulesets
return configCache.GetOrAdd(ruleset.RulesetInfo.ID.Value, _ => ruleset.CreateConfig(settingsStore)); return configCache.GetOrAdd(ruleset.RulesetInfo.ID.Value, _ => ruleset.CreateConfig(settingsStore));
} }
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
// ensures any potential database operations are finalised before game destruction.
foreach (var c in configCache.Values)
(c as IDisposable)?.Dispose();
}
} }
} }