Merge pull request #259 from AvarianKnight/dev

Fix radio clicks

client/init/init.lua

@@ -25,8 +25,18 @@ AddEventHandler('onClientResourceStart', function(resource)
 		micClicks = 'true'
 	end
 	sendUIMessage({
+		uiEnabled = GetConvarInt("voice_enableUi", 1) == 1,
 		voiceModes = json.encode(Cfg.voiceModes),
 		voiceMode = mode - 1
-	}, true)
+	})
+
+	-- Reinitialize channels if they're set.
+	if LocalPlayer.state.radioChannel ~= 0 then
+		setRadioChannel(LocalPlayer.state.radioChannel)
+	end
+
+	if LocalPlayer.state.callChannel ~= 0 then
+		setCallChannel(LocalPlayer.state.callChannel)
+	end
 	print('Script initialization finished.')
 end)

client/module/phone.lua

@@ -67,7 +67,7 @@ function setCallChannel(channel)
 	callChannel = channel
 	sendUIMessage({
 		callInfo = channel
-	}, true)
+	})
 	createPhoneThread()
 end
 

client/module/radio.lua

@@ -93,7 +93,7 @@ function setRadioChannel(channel)
 	sendUIMessage({
 		radioChannel = channel,
 		radioEnabled = radioEnabled
-	}, true)
+	})
 end
 
 --- exports setRadioChannel

client/utils/Nui.lua

@@ -1,7 +1,6 @@
 local uiReady = promise.new()
-function sendUIMessage(message, respectConvar)
+function sendUIMessage(message)
 	Citizen.Await(uiReady)
-	if respectConvar and GetConvarInt('voice_enableUi', 1) ~= 1 then return end
 	SendNUIMessage(message)
 end
 

server/main.lua

@@ -14,12 +14,16 @@ end
 
 function handleStateBagInitilization(source)
 	local plyState = Player(source).state
-	plyState:set('radio', tonumber(GetConvar('voice_defaultRadioVolume', '0.3')), true)
-	plyState:set('phone', tonumber(GetConvar('voice_defaultPhoneVolume', '0.6')), true)
-	plyState:set('proximity', {}, true)
-	plyState:set('callChannel', 0, true)
-	plyState:set('radioChannel', 0, true)
-	plyState:set('voiceIntent', 'speech', true)
+	if not plyState.pmaVoiceInit then 
+		plyState:set('radio', tonumber(GetConvar('voice_defaultRadioVolume', '0.3')), true)
+		plyState:set('phone', tonumber(GetConvar('voice_defaultPhoneVolume', '0.6')), true)
+		plyState:set('proximity', {}, true)
+		plyState:set('callChannel', 0, true)
+		plyState:set('radioChannel', 0, true)
+		plyState:set('voiceIntent', 'speech', true)
+		-- We want to save voice inits because we'll automatically reinitalize calls and channels
+		plyState:set('pmaVoiceInit', true, false)
+	end
 end
 
 -- temp fix before an actual fix is added