DominikSLK/cfx-server-data
1
0
Fork 0
mirror of https://github.com/citizenfx/cfx-server-data.git synced 2025-12-12 06:14:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

chat2: fix hide state being permanently overridden when faded out/paused

Browse Source
This commit is contained in:
astatine
2020-05-03 20:33:29 +02:00
committed by blattersturm
parent 872731b0ac
commit 99dac40452
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
resources/[gameplay]/chat/cl_chat.lua
View File

@@ -278,13 +278,17 @@ Citizen.CreateThread(function()
if chatLoaded then if chatLoaded then
local forceHide = IsScreenFadedOut() or IsPauseMenuActive() local forceHide = IsScreenFadedOut() or IsPauseMenuActive()
local wasForceHide = false
if forceHide then if chatHideState ~= CHAT_HIDE_STATES.ALWAYS_HIDE then
origChatHideState = chatHideState if forceHide then
chatHideState = CHAT_HIDE_STATES.ALWAYS_HIDE origChatHideState = chatHideState
elseif origChatHideState ~= -1 then chatHideState = CHAT_HIDE_STATES.ALWAYS_HIDE
end
elseif not forceHide and origChatHideState ~= -1 then
chatHideState = origChatHideState chatHideState = origChatHideState
origChatHideState = -1 origChatHideState = -1
wasForceHide = true
end end
if chatHideState ~= lastChatHideState then if chatHideState ~= lastChatHideState then
@@ -293,7 +297,7 @@ Citizen.CreateThread(function()
SendNUIMessage({ SendNUIMessage({
type = 'ON_SCREEN_STATE_CHANGE', type = 'ON_SCREEN_STATE_CHANGE',
hideState = chatHideState, hideState = chatHideState,
fromUserInteraction = not forceHide and not isFirstHide fromUserInteraction = not forceHide and not isFirstHide and not wasForceHide
}) })
isFirstHide = false isFirstHide = false