Re-fix Screensaver

Author: LifeHckr

TitleScreen/TitleScreen.cs

@@ -31,30 +31,28 @@ public override void _Ready()
 
     public override void _Input(InputEvent @event)
     {
-        _timer.Start();
-
-        if (@event.IsActionPressed("ButtonA") && !_isScreensaverActive)
+        
+        if (!(@event is not InputEventJoypadButton and not InputEventKey and not InputEventJoypadMotion))
         {
-            GetTree().ChangeSceneToFile( _buttonSceneMap[_gameTurnTable.GetCurrentSelection()]);
+            if (_isScreensaverActive)
+            {
+                _isScreensaverActive = false;
+                _audioStreamPlayer.Play();
+                _screensaverNode.Visible = false;
+            }  
+            _timer.Start();
         }
 
-        if (@event is not InputEventJoypadButton and not InputEventKey and not InputEventJoypadMotion)
+        if (@event.IsActionPressed("ButtonA") && !_isScreensaverActive)
         {
-            return; // These are the only events that should reset the screensaver. Doing this bc I think the touch screen is causing issues
+            GetTree().ChangeSceneToFile( _buttonSceneMap[_gameTurnTable.GetCurrentSelection()]);
         }
 
         if (@event.IsActionPressed("Mute")) //Non-reversible, mainly to not go insane while testing.
         {
             AudioServer.SetBusMute(AudioServer.GetBusIndex("Master"), true);
         }
 
-        if (_isScreensaverActive)
-        {
-            _isScreensaverActive = false;
-            _audioStreamPlayer.Play();
-            _screensaverNode.Visible = false;
-        }
-
     }
 
     private void _startScreensaver()