- respect the user's mod-wide "enabled" setting when changing profiles (ticket #117)

- also cleaned up some logic that could cause errors when enabling the mod due to a profile switch when the player initially loaded with it disabled
This commit is contained in:
Parnic
2011-01-26 01:05:04 +00:00
parent 0112d98761
commit fd7d8db005
4 changed files with 22 additions and 7 deletions

View File

@ -781,6 +781,10 @@ function IceCore.prototype:IsInConfigMode()
end
function IceCore.prototype:ConfigModeToggle(bWantConfig)
if self.bConfigMode == bWantConfig then
return
end
self.bConfigMode = bWantConfig
if bWantConfig then

View File

@ -410,7 +410,7 @@ function IceElement.prototype:IsVisible()
end
function IceElement.prototype:Show(bShouldShow)
if self.bIsVisible == bShouldShow then
if self.bIsVisible == bShouldShow or not self.masterFrame or not self.frame then
return nil
end

View File

@ -245,12 +245,12 @@ function IceHUD:OnEnable(isFirst)
if self.db.profile.enable then
self.IceCore:Enable()
end
-- Add dual-spec support
local LibDualSpec = LibStub('LibDualSpec-1.0', true)
if LibDualSpec then
LibDualSpec:EnhanceDatabase(self.db, "IceHUD")
end
-- Add dual-spec support
local LibDualSpec = LibStub('LibDualSpec-1.0', true)
if LibDualSpec then
LibDualSpec:EnhanceDatabase(self.db, "IceHUD")
end
--@debug@
@ -443,7 +443,9 @@ end
function IceHUD:PostProfileChanged(db, newProfile)
self:NotifyNewDb()
self.IceCore:Enable()
if self.db.profile.enable then
self.IceCore:Enable()
end
end
function IceHUD:ProfileReset()

View File

@ -347,6 +347,9 @@ This isn't |cff9999ffIceHUD|r - it's Blizzard's new Spell Alerts they added in 4
set = function(info, value)
IceHUD.IceCore:SetFontFamily(value)
end,
disabled = function()
return not IceHUD.IceCore:IsEnabled()
end,
values = AceGUIWidgetLSMlists.font,
order = 94.75,
},
@ -572,6 +575,9 @@ This isn't |cff9999ffIceHUD|r - it's Blizzard's new Spell Alerts they added in 4
func = function()
IceHUD:CreateCustomModuleAndNotify(lastCustomModule)
end,
disabled = function()
return not IceHUD.IceCore:IsEnabled()
end,
order = 94.6,
},
@ -585,6 +591,9 @@ This isn't |cff9999ffIceHUD|r - it's Blizzard's new Spell Alerts they added in 4
set = function(info, value)
IceHUD.IceCore:ConfigModeToggle(value)
end,
disabled = function()
return not IceHUD.IceCore:IsEnabled()
end,
order = 95
},