Improved handling of broken server connection

kaczy93 · Sep 24, 2024 · ef24629 · ef24629
1 parent 3caf532
commit ef24629
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/CentrED/UI/Windows/ConnectWindow.cs b/CentrED/UI/Windows/ConnectWindow.cs
@@ -146,13 +146,13 @@ protected override void InternalDraw()
             {
                 CEDGame.MapManager.Client.Disconnect();
                 CEDGame.MapManager.Reset();
-                Info = "Disconnected";
             }
         }
         else
         {
             if (ImGui.Button("Connect") || ImGui.IsWindowFocused() && ImGui.IsKeyPressed(ImGuiKey.Enter))
             {
+                CEDClient.ClearStatus();
                 CEDGame.MapManager.Reset();
                 _buttonDisabled = true;
                 new Task
@@ -166,8 +166,6 @@ protected override void InternalDraw()
                             CEDGame.MapManager.Load(_clientPath, _clientVersion);
                             Info = "Connecting";
                             CEDClient.Connect(_hostname, _port, _username, _password);
-                            Info = CEDClient.Status;
-                            InfoColor = CEDClient.Running ? UIManager.Green : UIManager.Red;
                         }
                         catch (SocketException)
                         {
@@ -188,6 +186,11 @@ protected override void InternalDraw()
                 ).Start();
             }
         }
+        if (CEDClient.Status != "")
+        {
+            Info = CEDClient.Status;
+            InfoColor = CEDClient.Running ? UIManager.Green : UIManager.Red;
+        }
         ImGui.EndDisabled();
         ImGui.End();
     }

diff --git a/Client/CentrEDClient.cs b/Client/CentrEDClient.cs
@@ -46,6 +46,11 @@ public string Status
         internal set => _status = value;
     }
 
+    public void ClearStatus()
+    {
+        Status = "";
+    }
+
     public void Connect(string hostname, int port, string username, string password)
     {
         Password = password;
@@ -86,6 +91,7 @@ public void Disconnect()
         Landscape = null;
         Initialized = false;
         Disconnected?.Invoke();
+        Status = "Disconnected";
     }
 
     public void Dispose()

diff --git a/Shared/Network/NetState.cs b/Shared/Network/NetState.cs
@@ -156,6 +156,7 @@ public bool Flush()
             LogError("Flush Error");
             Console.WriteLine(e);
             Disconnect();
+            FlushPending = false;
         }
 
         return Running;