coa.15: guard GetRestedXP + GetMoneyString/GetTimeString against no-value getters
release / release (push) Successful in 4s
release / release (push) Successful in 4s
GetRestedXP did 'rate * coeff' on a nil DS:GetRestXPRate result (crashed Account Summary). Guarded it, plus defensive nil->0 on the two common string helpers.
This commit is contained in:
@@ -552,6 +552,7 @@ function addon:GetSpellIDFromRecipeLink(link)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function addon:GetMoneyString(copper, color, noTexture)
|
function addon:GetMoneyString(copper, color, noTexture)
|
||||||
|
copper = copper or 0 -- CoA: callers may pass a no-value DS getter result
|
||||||
color = color or "|cFFFFD700"
|
color = color or "|cFFFFD700"
|
||||||
|
|
||||||
local gold = floor( copper / 10000 );
|
local gold = floor( copper / 10000 );
|
||||||
@@ -572,6 +573,7 @@ function addon:GetMoneyString(copper, color, noTexture)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function addon:GetTimeString(seconds)
|
function addon:GetTimeString(seconds)
|
||||||
|
seconds = seconds or 0 -- CoA: callers may pass a no-value DS getter result
|
||||||
local days = floor(seconds / 86400); -- TotalTime is expressed in seconds
|
local days = floor(seconds / 86400); -- TotalTime is expressed in seconds
|
||||||
seconds = mod(seconds, 86400)
|
seconds = mod(seconds, 86400)
|
||||||
local hours = floor(seconds / 3600);
|
local hours = floor(seconds / 3600);
|
||||||
@@ -648,7 +650,7 @@ function Altoholic:FormatDelay(timeStamp)
|
|||||||
end
|
end
|
||||||
|
|
||||||
function addon:GetRestedXP(character)
|
function addon:GetRestedXP(character)
|
||||||
local rate = DS:GetRestXPRate(character)
|
local rate = DS:GetRestXPRate(character) or 0 -- CoA: getter returns no value for unscanned/partial chars
|
||||||
|
|
||||||
local coeff = 1
|
local coeff = 1
|
||||||
if addon.Options:Get("RestXPMode") == 1 then
|
if addon.Options:Get("RestXPMode") == 1 then
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
## Author: Thaoky, Telkar-RG
|
## Author: Thaoky, Telkar-RG
|
||||||
## X-Edited-By: Exiles (Sub-Net) — florian.berthold@sub-net.at
|
## X-Edited-By: Exiles (Sub-Net) — florian.berthold@sub-net.at
|
||||||
## Version: 3.3.002b-coa.14
|
## Version: 3.3.002b-coa.15
|
||||||
## X-Category: Inventory, Tradeskill, Mail
|
## X-Category: Inventory, Tradeskill, Mail
|
||||||
## X-Localizations: enUS, frFR, zhCN, zhTW, deDE, koKR, esES, esMX, ruRU
|
## X-Localizations: enUS, frFR, zhCN, zhTW, deDE, koKR, esES, esMX, ruRU
|
||||||
## X-Website: http://wow.curse.com/downloads/wow-addons/details/altoholic.aspx
|
## X-Website: http://wow.curse.com/downloads/wow-addons/details/altoholic.aspx
|
||||||
|
|||||||
Reference in New Issue
Block a user