Close console before scene switch

Author: valkyrienyanko

Scripts/Msc/UIDebugger.cs

@@ -9,8 +9,8 @@ public class UIDebugger : Control
         [Export] public readonly NodePath NodePathLogs;
         [Export] public readonly NodePath NodePathConsole;
 
+        public static UIDebugger Instance { get; set; }
         private static TextEdit Logs { get; set; }
-        private static UIDebugger Instance { get; set; }
 
         private LineEdit Console { get; set; } // the console input
 

Scripts/Scenes/Game Servers/SceneGameServers.cs

@@ -68,14 +68,16 @@ public override async void _Ready()
                 await ListServers();
         }
 
-        public override async void _Input(InputEvent @event)
+        public override void _Input(InputEvent @event)
         {
-            await SceneManager.EscapeToScene("Menu", () =>
+            SceneManager.EscapePressed(async () =>
             {
                 WebClient.Client.CancelPendingRequests();
 
                 if (NetworkManager.GameClient != null)
                     NetworkManager.GameClient.CancelTask();
+
+                await SceneManager.ChangeScene("Menu");
             });
         }
 

Scripts/Scenes/Game/SceneGame.cs

@@ -73,10 +73,9 @@ public override void _PhysicsProcess(float delta)
             }
         }
 
-        public override async void _Input(InputEvent @event)
+        public override void _Input(InputEvent @event)
         {
-            if (Input.IsActionJustPressed("ui_cancel"))
-            {
+            SceneManager.EscapePressed(async () => {
                 if (SceneManager.PrevSceneName == "Menu")
                 {
                     // Singleplayer
@@ -90,7 +89,7 @@ public override async void _Input(InputEvent @event)
                     if (NetworkManager.GameServer != null)
                         NetworkManager.GameServer.Stop();
                 }
-            }
+            });
         }
 
         public void UpdatePlayerPositions(Dictionary<byte, DataEntityTransform> playerTransforms) => PlayerTransformQueue.Add(playerTransforms);

Scripts/Scenes/Main/SceneManager.cs

@@ -57,12 +57,17 @@ public static async Task ChangeScene(string sceneName, bool instant = true)
             Instance.AddChild(ActiveScene);
         }
 
-        public static async Task EscapeToScene(string scene, Action action)
+        public static void EscapePressed(Action action)
         {
             if (Input.IsActionJustPressed("ui_cancel"))
             {
+                if (UIDebugger.Instance.Visible) 
+                {
+                    UIDebugger.ToggleVisibility();
+                    return;
+                }
+
                 action();
-                await SceneManager.ChangeScene(scene);
             }
         }