h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 10:12:54 +08:00
Code Issues Releases Wiki Activity

Fix custom keybindings not working due to incorrect use of IsManaged flag

Browse Source
This commit is contained in:
Dean Herbert 2022-01-15 01:15:09 +09:00
parent 2f2c498477
commit 2984f2f6c4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,19 +78,20 @@ namespace osu.Game.Input.Bindings
{
var defaults = DefaultKeyBindings.ToList();
if (ruleset != null && !ruleset.IsManaged)
// some tests instantiate a ruleset which is not present in the database.
// in these cases we still want key bindings to work, but matching to database instances would result in none being present,
// so let's populate the defaults directly.
List<RealmKeyBinding> newBindings = realmKeyBindings.Detach()
// this ordering is important to ensure that we read entries from the database in the order
// enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
// have been eaten by the music controller due to query order.
.OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.ActionInt)).ToList();
// In the case no bindings were found in the database, presume this usage is for a non-databased ruleset.
// This actually should never be required and can be removed if it is ever deemed to cause a problem.
// See https://github.com/ppy/osu/issues/8805 for original reasoning, which is no longer valid as we use ShortName
// for lookups these days.
if (newBindings.Count == 0)
KeyBindings = defaults;
else
{
KeyBindings = realmKeyBindings.Detach()
// this ordering is important to ensure that we read entries from the database in the order
// enforced by DefaultKeyBindings. allow for song select to handle actions that may otherwise
// have been eaten by the music controller due to query order.
.OrderBy(b => defaults.FindIndex(d => (int)d.Action == b.ActionInt)).ToList();
}
KeyBindings = newBindings;
}
}
}