diff --git a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs index f9856f30ce..40bf74cbf1 100644 --- a/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs +++ b/osu.Game/Overlays/Settings/Sections/Input/KeyBindingRow.cs @@ -540,7 +540,8 @@ namespace osu.Game.Overlays.Settings.Sections.Input { base.Dispose(isDisposing); - keyCombinationProvider.KeymapChanged -= updateKeyCombinationText; + if (keyCombinationProvider != null) + keyCombinationProvider.KeymapChanged -= updateKeyCombinationText; } } }