Fix open prefs taint
This commit is contained in:
parent
d89fb5645a
commit
0d483a13a0
|
@ -8,6 +8,7 @@ local function bclick(swap)
|
||||||
if(not InCombatLockdown() and GarrisonLandingPage) then
|
if(not InCombatLockdown() and GarrisonLandingPage) then
|
||||||
if(GarrisonLandingPage:IsShown()) then
|
if(GarrisonLandingPage:IsShown()) then
|
||||||
GarrisonLandingPage_Toggle()
|
GarrisonLandingPage_Toggle()
|
||||||
|
GameMenuFrame:Hide()
|
||||||
if(not swap) then
|
if(not swap) then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -19,6 +20,7 @@ local function bclick(swap)
|
||||||
if(not GarrisonLandingPage.garrTypeID) then
|
if(not GarrisonLandingPage.garrTypeID) then
|
||||||
-- print("still no garrType")
|
-- print("still no garrType")
|
||||||
GarrisonLandingPage_Toggle()
|
GarrisonLandingPage_Toggle()
|
||||||
|
GameMenuFrame:Hide()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -74,7 +76,8 @@ local function OnClick(_, button)
|
||||||
if(not InCombatLockdown()) then
|
if(not InCombatLockdown()) then
|
||||||
if(SettingsPanel) then
|
if(SettingsPanel) then
|
||||||
if(SettingsPanel:IsVisible()) then
|
if(SettingsPanel:IsVisible()) then
|
||||||
SettingsPanel:Hide()
|
HideUIPanel(SettingsPanel)
|
||||||
|
HideUIPanel(GameMenuFrame)
|
||||||
else
|
else
|
||||||
Settings.OpenToCategory(childName)
|
Settings.OpenToCategory(childName)
|
||||||
end
|
end
|
||||||
|
|
6
core.lua
6
core.lua
|
@ -95,9 +95,9 @@ function events:PLAYER_ENTERING_WORLD()
|
||||||
if(not IsAddOnLoaded("Blizzard_GarrisonUI")) then
|
if(not IsAddOnLoaded("Blizzard_GarrisonUI")) then
|
||||||
UIParentLoadAddOn("Blizzard_GarrisonUI")
|
UIParentLoadAddOn("Blizzard_GarrisonUI")
|
||||||
end
|
end
|
||||||
if(db['hideStandard'] and GarrisonLandingPageMinimapButton) then
|
if(db['hideStandard'] and ExpansionLandingPageMinimapButton) then
|
||||||
GarrisonLandingPageMinimapButton:UnregisterAllEvents()
|
ExpansionLandingPageMinimapButton:UnregisterAllEvents()
|
||||||
GarrisonLandingPageMinimapButton:Hide()
|
ExpansionLandingPageMinimapButton:Hide()
|
||||||
end
|
end
|
||||||
child:switchDisplay(db['garrisonHideCombat'])
|
child:switchDisplay(db['garrisonHideCombat'])
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue