diff --git a/AceDB-3.0/AceDB-3.0.lua b/AceDB-3.0/AceDB-3.0.lua index a0a8936..30220de 100644 --- a/AceDB-3.0/AceDB-3.0.lua +++ b/AceDB-3.0/AceDB-3.0.lua @@ -90,6 +90,7 @@ local function copyDefaults(dest, src) --if type(dest) ~= "table" then return end for k, v in pairs(src) do if k == "*" or k == "**" then + if k=='*' then v=dest['*'] or v end if type(v) == "table" then -- This is a metatable used for table defaults local mt = { diff --git a/AceTimer-3.0/AceTimer-3.0.lua b/AceTimer-3.0/AceTimer-3.0.lua index e84d420..33c0b5b 100644 --- a/AceTimer-3.0/AceTimer-3.0.lua +++ b/AceTimer-3.0/AceTimer-3.0.lua @@ -172,7 +172,7 @@ end function AceTimer:TimeLeft(id) local timer = activeTimers[id] if not timer then - return 0 + return else return timer.ends - GetTime() end