Skip to content

Commit

Permalink
PVPReadyDialog replaces StaticPopup
Browse files Browse the repository at this point in the history
  • Loading branch information
jordonwow committed Sep 2, 2021
1 parent 62d8d10 commit e1681be
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions SafeQueue.lua
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ else
self.createPopup = battlefieldId
return
end
if StaticPopup_Visible("CONFIRM_BATTLEFIELD_ENTRY") then
StaticPopup_Hide("CONFIRM_BATTLEFIELD_ENTRY")
if PVPReadyDialog:IsShown() then
PVPReadyDialog:Hide()
end
self.createPopup = nil
self.popup.hidePopup = nil
Expand Down Expand Up @@ -124,10 +124,9 @@ else
self.timer = timer
end)

hooksecurefunc("StaticPopup_Show", function(name, _, _, i)
if name ~= "CONFIRM_BATTLEFIELD_ENTRY" then return end
hooksecurefunc("PVPReadyDialog_Display", function(_, i)
if InCombatLockdown() and (not SafeQueue:FindPopup(i)) then return end
StaticPopup_Hide(name)
PVPReadyDialog:Hide()
end)
end

Expand Down

0 comments on commit e1681be

Please sign in to comment.