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

Merge pull request #2300 from peppy/fix-skin-event-again

Browse Source 
Move binding to LoadComplete
This commit is contained in:
Dan Balasescu 2018-03-24 11:19:18 +09:00 committed by GitHub
commit 01a6d772e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Input/Bindings/DatabasedKeyBindingContainer.cs
View File

@ -45,6 +45,11 @@ namespace osu.Game.Input.Bindings
private void load(KeyBindingStore keyBindings) private void load(KeyBindingStore keyBindings)
{ {
store = keyBindings; store = keyBindings;
}
protected override void LoadComplete()
{
base.LoadComplete();
store.KeyBindingChanged += ReloadMappings; store.KeyBindingChanged += ReloadMappings;
} }

11
osu.Game/Skinning/LocalSkinOverrideContainer.cs
View File

@ -55,14 +55,19 @@ namespace osu.Game.Skinning
var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent)); var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
fallbackSource = dependencies.Get<ISkinSource>(); fallbackSource = dependencies.Get<ISkinSource>();
if (fallbackSource != null)
fallbackSource.SourceChanged += onSourceChanged;
dependencies.CacheAs<ISkinSource>(this); dependencies.CacheAs<ISkinSource>(this);
return dependencies; return dependencies;
} }
protected override void LoadComplete()
{
base.LoadComplete();
if (fallbackSource != null)
fallbackSource.SourceChanged += onSourceChanged;
}
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);