Fix behavior of color selection dropbox in lobby (FAForever#3765)

ANIALLATOR114 · Apr 8, 2022 · 64c0550 · 64c0550
1 parent af91346
commit 64c0550
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lua/ui/controls/combo.lua b/lua/ui/controls/combo.lua
@@ -656,8 +656,10 @@ BitmapCombo = Class(Group) {
         -- prev will be last control here
         self.ddm.Bottom:Set(prev.Bottom)
 
-        self._dropdown:Hide()
-        self._ddhidden = true
+        if self._dropdown:IsHidden() then
+            self._dropdown:Hide()
+            self._ddhidden = true
+        end
     end,
 
     SetBitmap = function(self, bmp, name)

diff --git a/lua/ui/lobby/lobby.lua b/lua/ui/lobby/lobby.lua
@@ -542,7 +542,6 @@ local function DoSlotBehavior(slot, key, name)
         else
             HostUtils.RemoveAI(slot)
         end
-        Check_Availaible_Color()
     else
         -- We're adding an AI of some sort.
         if lobbyComm:IsHost() then
@@ -1232,6 +1231,7 @@ function ClearSlotInfo(slotIndex)
     UpdateSlotBackground(slotIndex)
     ShowGameQuality()
     RefreshMapPositionForAllControls(slotIndex)
+    Check_Availaible_Color()
     refreshObserverList()
 end
 
@@ -3113,14 +3113,12 @@ function CreateUI(maxPlayers)
           else
             AssignAutoTeams()
           end
-          Check_Availaible_Color()
         end
         GUI.AIClearButton.OnClick = function()
           for i = 1, table.getn(ChangedSlots) do
             HostUtils.RemoveAI(ChangedSlots[i])
           end
           ChangedSlots = {}
-          Check_Availaible_Color()
         end
         GUI.TeamCountSelector.OnClick = function(Self, Index, Text)
           local OccupiedSlots = 0