Improvements to allow better connection dialog in content.

2020-04-17 14:44:33 +02:00
parent 04eab336a4
commit 27771a31f0
3 changed files with 104 additions and 13 deletions
--- a/Content.Client/EntryPoint.cs
+++ b/Content.Client/EntryPoint.cs
@@ -232,14 +232,27 @@ namespace Content.Client
            {
                if (args.NewLevel == ClientRunLevel.Initialize)
                {
-                    _stateManager.RequestStateChange<MainScreen>();
+                    SwitchToDefaultState(args.OldLevel == ClientRunLevel.Connected ||
+                                         args.OldLevel == ClientRunLevel.InGame);
                }
            };

+            SwitchToDefaultState();
+        }
+
+        private void SwitchToDefaultState(bool disconnected = false)
+        {
            // Fire off into state dependent on launcher or not.
+
            if (_gameController.LaunchState.FromLauncher)
            {
                _stateManager.RequestStateChange<LauncherConnecting>();
+                var state = (LauncherConnecting) _stateManager.CurrentState;
+
+                if (disconnected)
+                {
+                    state.SetDisconnected();
+                }
            }
            else
            {