From a627f25c95c243e7ab80cac67128ed930c19734a Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Wed, 26 Jul 2017 17:49:55 +0300
Subject: [PATCH] Fixed missing kick/ban buttons in the crew menu

---
 .../BarotraumaClient/Source/GameSession/CrewManager.cs      | 2 +-
 Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs | 6 ++----
 Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs | 5 ++---
 .../BarotraumaClient/Source/Networking/NetworkMember.cs     | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
index c882a7960..44f80b7a8 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/CrewManager.cs
@@ -262,7 +262,7 @@ namespace Barotrauma
 
             character.Info.CreateInfoFrame(previewPlayer);
 
-            if (GameMain.NetworkMember != null) GameMain.NetworkMember.SelectCrewCharacter(character, crewList);
+            if (GameMain.NetworkMember != null) GameMain.NetworkMember.SelectCrewCharacter(character, previewPlayer);
 
             return true;
         }
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
index d4e719ec9..649fe9980 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
@@ -1184,12 +1184,10 @@ namespace Barotrauma.Networking
             }
         }
 
-        public override bool SelectCrewCharacter(Character character, GUIComponent crewFrame)
+        public override bool SelectCrewCharacter(Character character, GUIComponent characterFrame)
         {
             if (character == null) return false;
-
-            var characterFrame = crewFrame.FindChild("selectedcharacter");
-
+            
             if (character != myCharacter)
             {
                 var client = GameMain.NetworkMember.ConnectedClients.Find(c => c.Character == character);
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs b/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs
index 57a83b08a..3b99be540 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/GameServer.cs
@@ -162,11 +162,10 @@ namespace Barotrauma.Networking
             };
         }
 
-        public override bool SelectCrewCharacter(Character character, GUIComponent crewFrame)
+        public override bool SelectCrewCharacter(Character character, GUIComponent characterFrame)
         {
             if (character == null) return false;
-
-            var characterFrame = crewFrame.FindChild("selectedcharacter");
+            
             if (character != myCharacter)
             {
                 var banButton = new GUIButton(new Rectangle(0, 0, 100, 20), "Ban", Alignment.BottomRight, "", characterFrame);
diff --git a/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs b/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs
index 6bc3ea1cb..2cf14aa9f 100644
--- a/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs
+++ b/Barotrauma/BarotraumaClient/Source/Networking/NetworkMember.cs
@@ -151,7 +151,7 @@ namespace Barotrauma.Networking
             }
         }
 
-        public virtual bool SelectCrewCharacter(Character character, GUIComponent crewFrame)
+        public virtual bool SelectCrewCharacter(Character character, GUIComponent characterFrame)
         {
             return false;
         }