h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:25:11 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-player-loader-song-playback

Browse Source
This commit is contained in:
Dan Balasescu 2017-11-13 19:52:28 +09:00 committed by GitHub
commit dbcf876294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
View File

@ -51,7 +51,9 @@ namespace osu.Game.Input.Bindings
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);
store.KeyBindingChanged -= ReloadMappings;
if (store != null)
store.KeyBindingChanged -= ReloadMappings;
} }
protected override void ReloadMappings() => KeyBindings = store.Query(ruleset?.ID, variant).ToList(); protected override void ReloadMappings() => KeyBindings = store.Query(ruleset?.ID, variant).ToList();

1
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -212,6 +212,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
nestedHitObjects = new List<DrawableHitObject<TObject>>(); nestedHitObjects = new List<DrawableHitObject<TObject>>();
h.OnJudgement += (d, j) => OnJudgement?.Invoke(d, j); h.OnJudgement += (d, j) => OnJudgement?.Invoke(d, j);
h.OnJudgementRemoved += (d, j) => OnJudgementRemoved?.Invoke(d, j);
nestedHitObjects.Add(h); nestedHitObjects.Add(h);
} }

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

@ -242,7 +242,7 @@ namespace osu.Game.Rulesets.UI
OnJudgement?.Invoke(j); OnJudgement?.Invoke(j);
}; };
drawableObject.OnJudgementRemoved += (d, j) => { OnJudgementRemoved?.Invoke(j); }; drawableObject.OnJudgementRemoved += (d, j) => OnJudgementRemoved?.Invoke(j);
Playfield.Add(drawableObject); Playfield.Add(drawableObject);
} }