From 88605bd0603165d3f2e82aa47a601e1cc21c398c Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Thu, 23 May 2019 15:13:02 +0300 Subject: [PATCH] (f95a5142b) Fixed: Game crashing when clicking on the 'No matchign servers found.' message in server list --- .../Source/Screens/ServerListScreen.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs index 163e3f9ae..c6c3e22db 100644 --- a/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs +++ b/Barotrauma/BarotraumaClient/Source/Screens/ServerListScreen.cs @@ -120,10 +120,11 @@ namespace Barotrauma serverList = new GUIListBox(new RectTransform(new Vector2(1.0f, 1.0f), serverListHolder.RectTransform, Anchor.Center)) { OnSelected = (btn, obj) => { - ServerInfo serverInfo = (ServerInfo)obj; - - serverInfo.CreatePreviewWindow(serverPreview); - + if (obj is ServerInfo) + { + ServerInfo serverInfo = (ServerInfo)obj; + serverInfo.CreatePreviewWindow(serverPreview); + } return true; } }; @@ -218,7 +219,7 @@ namespace Barotrauma private bool SelectServer(GUIComponent component, object obj) { - if (obj == null || waitingForRefresh) { return false; } + if (obj == null || waitingForRefresh || (!(obj is ServerInfo))) { return false; } if (!string.IsNullOrWhiteSpace(clientNameBox.Text)) {