From 8b3a089884262cc4e512ebba5ebddd7fc20d9820 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun, 28 Jan 2018 19:14:24 +0200
Subject: [PATCH] Fixed clients being unable to select subs, GUIListBoxes can
 be scrolled even if selection is disabled

---
 Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs         | 2 --
 Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs b/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
index 27fe27b40..fba0b1ba6 100644
--- a/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
+++ b/Barotrauma/BarotraumaClient/Source/GUI/GUIListBox.cs
@@ -306,8 +306,6 @@ namespace Barotrauma
 
             UpdateChildrenRect(deltaTime);
             
-            if (!enabled) return;
-
             if (scrollBarEnabled && !scrollBarHidden) scrollBar.Update(deltaTime);
 
             if ((MouseOn == this || MouseOn == scrollBar || IsParentOf(MouseOn)) && PlayerInput.ScrollWheelSpeed != 0)
diff --git a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
index ae83e3c01..e50451d00 100644
--- a/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
+++ b/Barotrauma/BarotraumaClient/Source/Screens/NetLobbyScreen.cs
@@ -1434,7 +1434,7 @@ namespace Barotrauma
             Submarine sub = Submarine.SavedSubmarines.Find(m => m.Name == subName && m.MD5Hash.Hash == md5Hash);
             if (sub == null) sub = Submarine.SavedSubmarines.Find(m => m.Name == subName);
 
-            var matchingListSub = subList.children.Find(c => c.UserData == sub) as GUITextBlock;
+            var matchingListSub = subList.children.Find(c => c.UserData == sub);
             if (matchingListSub != null)
             {
                 subList.OnSelected -= VotableClicked;
@@ -1452,7 +1452,7 @@ namespace Barotrauma
                 else if (sub.MD5Hash.Hash == null)
                 {
                     errorMsg = TextManager.Get("SubLoadError").Replace("[subname]", subName) + " ";
-                    if (matchingListSub != null) matchingListSub.TextColor = Color.Red;
+                    if (matchingListSub != null) matchingListSub.GetChild<GUITextBox>().TextColor = Color.Red;
                 }
                 else
                 {