From d3c6b62acd6564cdaa207ed70f0c8e264dd0de06 Mon Sep 17 00:00:00 2001 From: "Erik L. Vonderscheer" Date: Mon, 6 Jul 2009 06:51:04 +0000 Subject: [PATCH] Fix default expressions returning after deletion --- TradeFilter3.lua | 21 ++++++++++++++++----- TradeFilter3Options.lua | 12 ++++++------ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/TradeFilter3.lua b/TradeFilter3.lua index f05e4c8..d27e701 100644 --- a/TradeFilter3.lua +++ b/TradeFilter3.lua @@ -71,11 +71,11 @@ defaults = { editfilter_enable = false, editlists_enable = false, friendslist = {}, - whitelist = L.WHITELIST, - blacklist = L.BLACKLIST, - filters = L.FILTERS, - basefilters = L.FILTERS.BASE, - tradefilters = L.FILTERS.TRADE, + whitelist = {}, + blacklist = {}, + filters = {}, + basefilters = {}, + tradefilters = {}, }, } @@ -102,6 +102,11 @@ function TF3:OnInitialize() self.OptionsPanel.profiles = ACD:AddToBlizOptions("TradeFilter3P", L["Profiles"], self.name) self.OptionsPanel.about = LAP.new(self.name, self.name) + if (TF3.db.profile.firstlogin == true) then + TF3:FirstLogin() + TF3.db.profile.firstlogin = false + end + if IsLoggedIn() then self:IsLoggedIn() else @@ -115,6 +120,12 @@ function TF3:OpenOptions() InterfaceOptionsFrame_OpenToCategory(self.OptionsPanel) end +function TF3:FirstLogin() + TF3.db.profile.whitelist = L.WHITELIST + TF3.db.profile.blacklist = L.BLACKLIST + TF3.db.profile.filters = L.FILTERS +end + function TF3:IsLoggedIn() self:RegisterEvent("FRIENDLIST_UPDATE", "GetFriends") friends.RegisterCallback(self, "Added") diff --git a/TradeFilter3Options.lua b/TradeFilter3Options.lua index 97ec5f2..a96d112 100644 --- a/TradeFilter3Options.lua +++ b/TradeFilter3Options.lua @@ -165,7 +165,7 @@ options = { --~ desc = L["BTF"], get = function(info) local ret = ''; - for k, v in pairs(TF3.db.profile.tradefilters) do + for k, v in pairs(TF3.db.profile.filters.TRADE) do if ret == '' then ret = k..' = '..v; else @@ -175,14 +175,14 @@ options = { return ret; end, set = function(info, value) - TF3:ClearTable(TF3.db.profile.tradefilters) + TF3:ClearTable(TF3.db.profile.filters.TRADE) local tbl = { strsplit('\n', value) }; local type, val; for i, str in pairs(tbl) do type, val = strsplit('=', str); type = strtrim(type); val = strtrim(val); - TF3.db.profile.tradefilters[type] = val; + TF3.db.profile.filters.TRADE[type] = val; end end, }, @@ -198,7 +198,7 @@ options = { --~ desc = L["BCF"], get = function(info) local ret = ''; - for k, v in pairs(TF3.db.profile.basefilters) do + for k, v in pairs(TF3.db.profile.filters.BASE) do if ret == '' then ret = k..' = '..v; else @@ -208,14 +208,14 @@ options = { return ret; end, set = function(info, value) - TF3:ClearTable(TF3.db.profile.basefilters) + TF3:ClearTable(TF3.db.profile.filters.BASE) local tbl = { strsplit('\n', value) }; local type, val; for i, str in pairs(tbl) do type, val = strsplit('=', str); type = strtrim(type); val = strtrim(val); - TF3.db.profile.basefilters[type] = val; + TF3.db.profile.filters.BASE[type] = val; end end, }, -- 1.7.9.5