From 8b44916c87ac4f037c468585b69609912e49634c Mon Sep 17 00:00:00 2001 From: Pinya <800pin.ru@gmail.com> Date: Wed, 18 Jul 2018 15:08:04 +0300 Subject: [PATCH] fix leak of global values --- ElvUI/Core/Math.lua | 5 +++-- ElvUI/Core/core.lua | 1 + ElvUI/Libraries/AceCore-3.0/AceCore-3.0.lua | 2 +- ElvUI/Modules/Bags/Bags.lua | 2 +- ElvUI/Modules/Skins/Blizzard/Bags.lua | 2 +- ElvUI/Modules/Skins/Blizzard/Friends.lua | 2 +- ElvUI/Modules/Skins/Blizzard/Quest.lua | 1 + ElvUI/Modules/Skins/Blizzard/Raid.lua | 2 +- ElvUI/Modules/Skins/Blizzard/Stable.lua | 2 +- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ElvUI/Core/Math.lua b/ElvUI/Core/Math.lua index ed31418..0300e5e 100644 --- a/ElvUI/Core/Math.lua +++ b/ElvUI/Core/Math.lua @@ -208,7 +208,8 @@ function E:GetFormattedText(style, min, max) if max == 0 then max = 1 end - gftDec = E.db.general.decimalLength or 1 + local gftUseStyle + local gftDec = E.db.general.decimalLength or 1 if gftDec ~= 1 and find(style, "PERCENT") then gftUseStyle = gsub(styles[style], "%%%.1f%%%%", "%%."..gftDec.."f%%%%") else @@ -216,7 +217,7 @@ function E:GetFormattedText(style, min, max) end if style == "DEFICIT" then - gftDeficit = max - min + local gftDeficit = max - min return ((gftDeficit > 0) and format(gftUseStyle, E:ShortValue(gftDeficit))) or "" elseif style == "PERCENT" then return format(gftUseStyle, min / max * 100) diff --git a/ElvUI/Core/core.lua b/ElvUI/Core/core.lua index 4966189..4b8a25b 100644 --- a/ElvUI/Core/core.lua +++ b/ElvUI/Core/core.lua @@ -21,6 +21,7 @@ local SendAddonMessage = SendAddonMessage local CUSTOM_CLASS_COLORS = CUSTOM_CLASS_COLORS local RAID_CLASS_COLORS = RAID_CLASS_COLORS +local _ _, E.myclass = UnitClass("player") -- Constants _, E.myrace = UnitRace("player") _, E.myfaction = UnitFactionGroup("player") diff --git a/ElvUI/Libraries/AceCore-3.0/AceCore-3.0.lua b/ElvUI/Libraries/AceCore-3.0/AceCore-3.0.lua index 3ddb49b..d9d3464 100644 --- a/ElvUI/Libraries/AceCore-3.0/AceCore-3.0.lua +++ b/ElvUI/Libraries/AceCore-3.0/AceCore-3.0.lua @@ -123,7 +123,7 @@ end local function strsplit(delim, s, n) if n and n < 2 then return s end - beg = beg or 1 + local beg = beg or 1 local i,j = string.find(s,delim,beg) if not i then return s, nil diff --git a/ElvUI/Modules/Bags/Bags.lua b/ElvUI/Modules/Bags/Bags.lua index 696b143..f2b9489 100644 --- a/ElvUI/Modules/Bags/Bags.lua +++ b/ElvUI/Modules/Bags/Bags.lua @@ -248,7 +248,7 @@ function B:UpdateSlot(bagID, slotID) if B.ProfessionColors[bagType] then slot:SetBackdropBorderColor(unpack(B.ProfessionColors[bagType])) elseif clink then - local iLvl, itemEquipLoc + local _, iLvl, itemEquipLoc slot.name, _, slot.rarity, iLvl, _, _, _, itemEquipLoc = GetItemInfo(match(clink, "item:(%d+)")) local r, g, b diff --git a/ElvUI/Modules/Skins/Blizzard/Bags.lua b/ElvUI/Modules/Skins/Blizzard/Bags.lua index 844b62a..396132a 100644 --- a/ElvUI/Modules/Skins/Blizzard/Bags.lua +++ b/ElvUI/Modules/Skins/Blizzard/Bags.lua @@ -68,7 +68,7 @@ local function LoadSkin() S:SecureHookScript(containerFrame, "OnShow", "ContainerFrame_Update") - local itemButton, itemButtonIcon + local itemButton, itemButtonIcon, itemButtonCooldown for k = 1, MAX_CONTAINER_ITEMS, 1 do itemButton = _G["ContainerFrame"..i.."Item"..k] itemButtonIcon = _G["ContainerFrame"..i.."Item"..k.."IconTexture"] diff --git a/ElvUI/Modules/Skins/Blizzard/Friends.lua b/ElvUI/Modules/Skins/Blizzard/Friends.lua index c1990d7..25baa75 100644 --- a/ElvUI/Modules/Skins/Blizzard/Friends.lua +++ b/ElvUI/Modules/Skins/Blizzard/Friends.lua @@ -20,7 +20,7 @@ for k, v in pairs(LOCALIZED_CLASS_NAMES_FEMALE) do localizedTable[v] = k end -function LoadSkin() +local function LoadSkin() if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.friends ~= true then return end -- Friends Frame diff --git a/ElvUI/Modules/Skins/Blizzard/Quest.lua b/ElvUI/Modules/Skins/Blizzard/Quest.lua index 6f10bdd..f8ecf92 100644 --- a/ElvUI/Modules/Skins/Blizzard/Quest.lua +++ b/ElvUI/Modules/Skins/Blizzard/Quest.lua @@ -112,6 +112,7 @@ local function LoadSkin() local function QuestQualityColors(frame, text, quality, link) if link and not quality then + local _ _, _, quality = GetItemInfo(match(link, "item:(%d+)")) end diff --git a/ElvUI/Modules/Skins/Blizzard/Raid.lua b/ElvUI/Modules/Skins/Blizzard/Raid.lua index a838ac1..106c9e4 100644 --- a/ElvUI/Modules/Skins/Blizzard/Raid.lua +++ b/ElvUI/Modules/Skins/Blizzard/Raid.lua @@ -8,7 +8,7 @@ local pairs = pairs --WoW API / Variables local hooksecurefunc = hooksecurefunc -function LoadSkin() +local function LoadSkin() if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.raid ~= true then return end -- RaidFrame diff --git a/ElvUI/Modules/Skins/Blizzard/Stable.lua b/ElvUI/Modules/Skins/Blizzard/Stable.lua index 0e0f15a..7d2730d 100644 --- a/ElvUI/Modules/Skins/Blizzard/Stable.lua +++ b/ElvUI/Modules/Skins/Blizzard/Stable.lua @@ -10,7 +10,7 @@ local HasPetUI = HasPetUI local hooksecurefunc = hooksecurefunc local UnitExists = UnitExists -function LoadSkin() +local function LoadSkin() if E.private.skins.blizzard.enable ~= true or E.private.skins.blizzard.stable ~= true then return end E:StripTextures(PetStableFrame)