Skip to content

Commit 4ad8847

Browse files
committed
chat: FlashTabIfNotShown error, CHAT_OPTIONS doesnt exist on tbc ptr
1 parent 77d7815 commit 4ad8847

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

ElvUI/Core/Modules/Chat/Chat.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2035,11 +2035,11 @@ end
20352035

20362036
-- Clone from ChatFrame.xml modified by Simpy
20372037
local function FlashTabIfNotShown(frame, info, chatType, chatGroup, chatTarget)
2038-
if not frame:IsShown() and ((frame == _G.DEFAULT_CHAT_FRAME and info.flashTabOnGeneral) or (frame ~= _G.DEFAULT_CHAT_FRAME and info.flashTab)) then
2039-
if (not _G.CHAT_OPTIONS.HIDE_FRAME_ALERTS or chatType == 'WHISPER' or chatType == 'BN_WHISPER') --BN_WHISPER FIXME
2040-
and not _G.FCFManager_ShouldSuppressMessageFlash(frame, chatGroup, chatTarget) then
2041-
_G.FCF_StartAlertFlash(frame)
2042-
end
2038+
if frame:IsShown() then return end
2039+
2040+
local allowAlerts = ((frame ~= _G.DEFAULT_CHAT_FRAME and info.flashTab) or (frame == _G.DEFAULT_CHAT_FRAME and info.flashTabOnGeneral)) and ((chatType == 'WHISPER' or chatType == 'BN_WHISPER') or (_G.CHAT_OPTIONS and not _G.CHAT_OPTIONS.HIDE_FRAME_ALERTS))
2041+
if allowAlerts and not _G.FCFManager_ShouldSuppressMessageFlash(frame, chatGroup, chatTarget) then
2042+
_G.FCF_StartAlertFlash(frame)
20432043
end
20442044
end
20452045

0 commit comments

Comments
 (0)