Skip to content

Fix Great Vault Escape handling when opened through macros or other addons #2075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EllesmereGaming merged 1 commit into from
Sep 17, 2026
+18 −8
Merged

Fix Great Vault Escape handling when opened through macros or other addons #2075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions EllesmereUI.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11526,6 +11526,24 @@ initFrame:SetScript("OnEvent", function(self, event)
frame:HookScript("OnShow", RefreshProxy)
frame:HookScript("OnHide", RefreshProxy)
end

-- Register the Vault once, regardless of which shortcut opens it.
local function RegisterVaultEscapeClose()
if not WeeklyRewardsFrame then return false end
EllesmereUI.RegisterEscapeClose(WeeklyRewardsFrame)
RefreshProxy()
return true
end

if not RegisterVaultEscapeClose() then
local vaultLoader = CreateFrame("Frame")
vaultLoader:RegisterEvent("ADDON_LOADED")
vaultLoader:SetScript("OnEvent", function(self, event, addonName)
if addonName == "Blizzard_WeeklyRewards" and RegisterVaultEscapeClose() then
self:UnregisterEvent("ADDON_LOADED")
end
end)
end
end

-- Create native minimap button
Expand Down
1 change: 0 additions & 1 deletion EllesmereUIDataBars/EllesmereUIDataBars_Blocks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6223,7 +6223,6 @@ local function GVToggleVault()
end
local wrf = _G.WeeklyRewardsFrame
if not wrf then return end
if EllesmereUI.RegisterEscapeClose then EllesmereUI.RegisterEscapeClose(wrf) end
wrf:SetShown(not wrf:IsShown())
end

Expand Down
7 changes: 0 additions & 7 deletions EllesmereUIMinimap/EllesmereUIMinimap.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,12 +1452,6 @@ end
local _greatVaultBtn = nil
local GREAT_VAULT_WHOLE_ATLAS = "greatVault-whole-normal"

local function RegisterVaultEscClose()
local wrf = _G.WeeklyRewardsFrame
if not wrf or not EllesmereUI.RegisterEscapeClose then return end
EllesmereUI.RegisterEscapeClose(wrf)
end

local function ColorizeVaultText(text, r, g, b)
r = math.floor(math.max(0, math.min(1, r or 1)) * 255 + 0.5)
g = math.floor(math.max(0, math.min(1, g or 1)) * 255 + 0.5)
Expand Down Expand Up @@ -1679,7 +1673,6 @@ local function ToggleGreatVault()
if Load and IsLoaded and not IsLoaded("Blizzard_WeeklyRewards") then
Load("Blizzard_WeeklyRewards")
end
RegisterVaultEscClose()
if WeeklyRewardsFrame then
WeeklyRewardsFrame:SetShown(not WeeklyRewardsFrame:IsShown())
end
Expand Down