From e1a2f6af6299ac6ad117dfd289ffdd24bef142b8 Mon Sep 17 00:00:00 2001 From: Regalis Date: Wed, 5 Apr 2017 21:57:00 +0300 Subject: [PATCH] Fixed the name of the server being overridden with "Server" every time a client selects the lobby screen --- Subsurface/Source/Screens/NetLobbyScreen.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Subsurface/Source/Screens/NetLobbyScreen.cs b/Subsurface/Source/Screens/NetLobbyScreen.cs index 6160f4db9..f5be32630 100644 --- a/Subsurface/Source/Screens/NetLobbyScreen.cs +++ b/Subsurface/Source/Screens/NetLobbyScreen.cs @@ -50,7 +50,7 @@ namespace Barotrauma private GUIDropDown shuttleList; public bool IsServer; - public string ServerName; + public string ServerName = "Server"; private UInt16 lastUpdateID; public UInt16 LastUpdateID @@ -62,11 +62,6 @@ namespace Barotrauma private Sprite backgroundSprite; private GUITextBox serverMessage; - //public string ServerMessage - //{ - // get { return serverMessage.Text; } - // set { if (GameMain.Server != null) return; serverMessage.Text = value; } - //} public GUITextBox ServerMessage { @@ -381,7 +376,7 @@ namespace Barotrauma missionTypeButtons[0].Enabled = GameMain.Server != null; missionTypeButtons[1].Enabled = GameMain.Server != null; - ServerName = (GameMain.Server == null) ? "Server" : GameMain.Server.Name; + ServerName = (GameMain.Server == null) ? ServerName : GameMain.Server.Name; infoFrame.RemoveChild(StartButton); infoFrame.RemoveChild(infoFrame.children.Find(c => c.UserData as string == "settingsButton"));