From baf9e028c30910012c0ca3d5236eb148fbf93c4a Mon Sep 17 00:00:00 2001
From: Roman Kapustin <TocoToucanMS@gmail.com>
Date: Wed, 26 Sep 2018 19:44:01 +0300
Subject: [PATCH] Fix possible idleTracker nullref

---
 osu.Game/{Screens/Menu => Input}/IdleTracker.cs | 2 +-
 osu.Game/OsuGame.cs                             | 1 +
 osu.Game/Screens/Menu/ButtonSystem.cs           | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename osu.Game/{Screens/Menu => Input}/IdleTracker.cs (97%)

diff --git a/osu.Game/Screens/Menu/IdleTracker.cs b/osu.Game/Input/IdleTracker.cs
similarity index 97%
rename from osu.Game/Screens/Menu/IdleTracker.cs
rename to osu.Game/Input/IdleTracker.cs
index 8e7c835823..bbc15fe7af 100644
--- a/osu.Game/Screens/Menu/IdleTracker.cs
+++ b/osu.Game/Input/IdleTracker.cs
@@ -6,7 +6,7 @@
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 
-namespace osu.Game.Screens.Menu
+namespace osu.Game.Input
 {
     public class IdleTracker : Component, IKeyBindingHandler<PlatformAction>
     {
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 4e933f57bc..bb721afec4 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -26,6 +26,7 @@
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
 using osu.Game.Graphics;
+using osu.Game.Input;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Overlays.Notifications;
 using osu.Game.Rulesets;
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 8082c7b262..d86d7529a8 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -14,6 +14,7 @@
 using osu.Framework.Logging;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
+using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.Overlays;
 using OpenTK;
@@ -269,7 +270,7 @@ private void updateLogoState(ButtonSystemState lastState = ButtonSystemState.Ini
 
         protected override void Update()
         {
-            if (idleTracker.IdleTime > 6000 && State != ButtonSystemState.Exit)
+            if (idleTracker?.IdleTime > 6000 && State != ButtonSystemState.Exit)
                 State = ButtonSystemState.Initial;
 
             base.Update();