Skip to content

Commit

Permalink
Merge branch 'main' into ptr
Browse files Browse the repository at this point in the history
  • Loading branch information
kodewdle committed Nov 15, 2024
2 parents 5f43e5a + a7ddb4c commit 47eb6d2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions ElvUI/Core/Modules/Misc/Misc.lua
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,10 @@ function M:Initialize()
M:ZoneTextToggle()
M:ToggleInterrupt()

if not E.ClassicAnniv then -- it uses Blizzard_GroupFinder_VanillaStyle
M:LoadQueueStatus()
end

M:RegisterEvent('MERCHANT_SHOW')
M:RegisterEvent('RESURRECT_REQUEST')
M:RegisterEvent('PLAYER_REGEN_DISABLED', 'ErrorFrameToggle')
Expand All @@ -386,10 +390,6 @@ function M:Initialize()
M:RegisterEvent('QUEST_COMPLETE')
M:RegisterEvent('ADDON_LOADED')

if not E.ClassicAnniv then
M:LoadQueueStatus()
end

for _, addon in next, { 'Blizzard_InspectUI', 'Blizzard_PTRFeedback', E.ClassicAnniv and 'Blizzard_GroupFinder_VanillaStyle' or nil } do
if IsAddOnLoaded(addon) then
M:ADDON_LOADED(nil, addon)
Expand Down

0 comments on commit 47eb6d2

Please sign in to comment.