Skip to content

Commit a998f8b

Browse files
committed
Fix the Sorted addon blocking ESC menu from working
1 parent 3937b62 commit a998f8b

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

NoAutoclose.lua

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ local FRAME_POSITION_KEYS = {
3131

3232
local function table_invert(t)
3333
local s = {};
34-
for k,v in pairs(t) do
34+
for k, v in pairs(t) do
3535
s[v] = k;
3636
end
3737

@@ -318,7 +318,7 @@ function ns:ConfigureSecureEscHandler(frame, alwaysSetBindingOnShow, callRegenDi
318318
end
319319
end
320320

321-
function ns:ADDON_LOADED()
321+
function ns:ADDON_LOADED(loadedAddon)
322322
local flippedUiSpecialFrames = table_invert(UISpecialFrames);
323323

324324
for name, info in pairs(UIPanelWindows) do
@@ -333,14 +333,18 @@ function ns:ADDON_LOADED()
333333
WorldMapFrame:SetAttribute('UIPanelLayout-defined', '1');
334334
WorldMapFrame:SetAttribute('UIPanelLayout-maximizePoint', 'TOP');
335335
end
336+
if loadedAddon == 'Sorted' then
337+
-- that addon does some silly stuff, easier to just hardcode a workaround than to find a convoluted fix
338+
tDeleteItem(UISpecialFrames, 'BankFrame');
339+
end
336340
end
337341

338342
ns.playerInteractionHideMap = {
339343
[Enum.PlayerInteractionType.Gossip] = 'GossipFrame',
340344
[Enum.PlayerInteractionType.QuestGiver] = 'QuestFrame',
341345
};
342346

343-
function ns:PLAYER_INTERACTION_MANAGER_FRAME_SHOW(_, type)
347+
function ns:PLAYER_INTERACTION_MANAGER_FRAME_SHOW(type)
344348
for mapType, frameName in pairs(self.playerInteractionHideMap) do
345349
local frame = _G[frameName];
346350
if type ~= mapType and frame.IsShown and frame:IsShown() then
@@ -349,7 +353,7 @@ function ns:PLAYER_INTERACTION_MANAGER_FRAME_SHOW(_, type)
349353
end
350354
end
351355

352-
function ns:PLAYER_INTERACTION_MANAGER_FRAME_HIDE(_, type)
356+
function ns:PLAYER_INTERACTION_MANAGER_FRAME_HIDE(type)
353357
if self.playerInteractionHideMap[type] then
354358
local frame = _G[self.playerInteractionHideMap[type]];
355359
if frame and frame.IsShown and frame:IsShown() then
@@ -368,7 +372,7 @@ function ns:Init()
368372
self:ReworkSettingsOpenAndClose();
369373

370374
self.eventFrame = CreateFrame('Frame');
371-
self.eventFrame:HookScript('OnEvent', function(_, event, ...) self[event](self, event, ...); end);
375+
self.eventFrame:HookScript('OnEvent', function(_, event, ...) self[event](self, ...); end);
372376
self.eventFrame:RegisterEvent('ADDON_LOADED');
373377
self.eventFrame:RegisterEvent('PLAYER_INTERACTION_MANAGER_FRAME_SHOW');
374378
self.eventFrame:RegisterEvent('PLAYER_INTERACTION_MANAGER_FRAME_HIDE');

0 commit comments

Comments
 (0)