Merge pull request #859 from AntlerForce/startboxcombo

Hide startboxcombobox if in joinqueue
beyond-all-reason · Dec 17, 2024 · 894a082 · 894a082
2 parents 68a83a8 + c5ee040
commit 894a082
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/LuaMenu/widgets/gui_battle_room_window.lua b/LuaMenu/widgets/gui_battle_room_window.lua
@@ -1192,9 +1192,10 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
 	end
 
 	-- Lobby interface
-	function externalFunctions.UpdateUserTeamStatus(userName, allyNumber, isSpectator)
+	function externalFunctions.UpdateUserTeamStatus(userName, allyNumber, isSpectator, queuePos)
+		local iAmQueued = queuePos and queuePos > 0
 		if userName == myUserName then
-			if isSpectator and battleLobby.name ~= "singleplayer" and battle.bossed ~= true then
+			if battleLobby.name ~= "singleplayer" and battle.bossed ~= true and (isSpectator or iAmQueued) then
 				-- SetButtonStateSpectating()
 				startBoxPanel:Hide()
 				minimapPanel.disableChildrenHitTest = true --omg this is amazing
@@ -3258,7 +3259,7 @@ local function InitializeControls(battleID, oldLobby, topPoportion, setupData)
 	local function OnUpdateUserTeamStatus(listener, userName, allyNumber, isSpectator, queuePos)
 		-- Spring.Echo("room:OnUpdateUserTeamStatus userName:" .. tostring(userName) .. " allyNumber:" .. tostring(allyNumber) .. " isSpectator:" .. tostring(isSpectator))
 		--votePanel.VoteButtonVisible(isSpectator == false)
-		infoHandler.UpdateUserTeamStatus(userName, allyNumber, isSpectator)
+		infoHandler.UpdateUserTeamStatus(userName, allyNumber, isSpectator, queuePos)
 		playerHandler.UpdateUserTeamStatus(userName, allyNumber, isSpectator, queuePos)
 	end