From c745745493a7a378a65af753da193c74439dd5ec Mon Sep 17 00:00:00 2001 From: Kith Date: Sat, 1 Jul 2017 18:26:59 +1200 Subject: [PATCH] Added a catch for malformed cooldown timers to prevent lua error on Notify Fixed localization error in Ellipsis_Options --- Ellipsis/Cooldown.lua | 2 ++ Ellipsis/Ellipsis.toc | 2 +- Ellipsis_Options/ControlOptions.lua | 2 +- Ellipsis_Options/Ellipsis_Options.toc | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Ellipsis/Cooldown.lua b/Ellipsis/Cooldown.lua index 3f8f4b8..e1e2ac9 100644 --- a/Ellipsis/Cooldown.lua +++ b/Ellipsis/Cooldown.lua @@ -553,6 +553,8 @@ local function CreateTimer() end function CooldownTimer:New(currentTime, group, timerID, timerName, timerIcon, startTime, duration) + if (not timerName) then return end -- catch to abort if creating an invalid timer + local new = tremove(timerPool, 1) -- grab an timer from the inactive pool (if any) if (not new) then -- no inactive timers, create new diff --git a/Ellipsis/Ellipsis.toc b/Ellipsis/Ellipsis.toc index 197bcc8..85b6335 100644 --- a/Ellipsis/Ellipsis.toc +++ b/Ellipsis/Ellipsis.toc @@ -2,7 +2,7 @@ ## Title: Ellipsis (|cff67b1e9K|cff4779ceith|cff67b1e9M|cff4779ceod|r) ## Notes: A full-featured, multi-target Aura (DoTs and HoTs) tracker. ## Author: Kith -## Version: 4.2.7 +## Version: 4.2.8 ## SavedVariables: EllipsisDB, EllipsisVersion ## OptionalDeps: Ace3, LibSharedMedia-3.0, LibSink-2.0 ## X-Embeds: Ace3, LibSharedMedia-3.0, LibSink-2.0 diff --git a/Ellipsis_Options/ControlOptions.lua b/Ellipsis_Options/ControlOptions.lua index ac9e745..a0fc6e1 100644 --- a/Ellipsis_Options/ControlOptions.lua +++ b/Ellipsis_Options/ControlOptions.lua @@ -16,7 +16,7 @@ local function GetFilteredAuras() for spellID in pairs(filterList) do name = GetSpellInfo(spellID) - name = name or L.Aura_Unknown + name = name or LUG.Aura_Unknown filterAuraList[spellID] = format('[|cffffd100%d|r] %s', spellID, name) end diff --git a/Ellipsis_Options/Ellipsis_Options.toc b/Ellipsis_Options/Ellipsis_Options.toc index 0240cf5..d5732f2 100644 --- a/Ellipsis_Options/Ellipsis_Options.toc +++ b/Ellipsis_Options/Ellipsis_Options.toc @@ -2,7 +2,7 @@ ## Title: Ellipsis Options (|cff67b1e9K|cff4779ceith|cff67b1e9M|cff4779ceod|r) ## Notes: Options for Ellipsis. Must be enabled to alter settings. ## Author: Kith -## Version: 4.2.7 +## Version: 4.2.8 ## RequiredDeps: Ellipsis ## OptionalDeps: Ace3 ## LoadOnDemand: 1 -- 1.7.9.5