From 09089a31260122e1385aa58acbdcbc6bb781731d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 16 Aug 2017 23:20:08 +0900
Subject: [PATCH] Fix potential nullref

---
 osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs b/osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs
index e9eab49c32..31be2e6adc 100644
--- a/osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs
+++ b/osu.Game/Input/Bindings/GlobalKeyBindingInputManager.cs
@@ -30,7 +30,8 @@ namespace osu.Game.Input.Bindings
             new KeyBinding(new[] { Key.LControl, Key.D }, GlobalAction.ToggleDirect),
         };
 
-        protected override IEnumerable<Drawable> GetKeyboardInputQueue() => new[] { handler }.Concat(base.GetKeyboardInputQueue());
+        protected override IEnumerable<Drawable> GetKeyboardInputQueue() =>
+            handler == null ? base.GetKeyboardInputQueue() : new[] { handler }.Concat(base.GetKeyboardInputQueue());
     }
 
     public enum GlobalAction