fix(client/radio): Update UI state when removed from radio

AvarianKnight · Apr 30, 2022 · 8988515 · 8988515
1 parent 4e73a11
commit 8988515
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/client/module/radio.lua b/client/module/radio.lua
@@ -80,7 +80,16 @@ function removePlayerFromRadio(plySource)
 		end
 	end
 end
-RegisterNetEvent('pma-voice:removePlayerFromRadio', removePlayerFromRadio)
+
+RegisterNetEvent('pma-voice:removePlayerFromRadio', function(plySource, updateUi)
+	removePlayerFromRadio(plySource)
+	if updateUi and plySource == playerServerId then
+		sendUIMessage({
+			radioChannel = 0,
+			radioEnabled = radioEnabled
+		})
+	end
+end)
 
 --- function setRadioChannel
 --- sets the local players current radio channel and updates the server

diff --git a/server/module/radio.lua b/server/module/radio.lua
@@ -51,7 +51,7 @@ exports('overrideRadioNameGetter', overrideRadioNameGetter)
 function addPlayerToRadio(source, radioChannel)
 	if not canJoinChannel(source, radioChannel) then
 		-- remove the player from the radio client side
-		return TriggerClientEvent('pma-voice:removePlayerFromRadio', source, source)
+		return TriggerClientEvent('pma-voice:removePlayerFromRadio', source, source, true)
 	end
 	logger.verbose('[radio] Added %s to radio %s', source, radioChannel)