Merge branch 'release/2.18.1'

evil-morfar · Feb 28, 2020 · c6e62a4 · c6e62a4
2 parents dd928bd + 4a44523
commit c6e62a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/RCLootCouncil.toc b/RCLootCouncil.toc
@@ -1,8 +1,8 @@
 ## Author: Potdisc
 ## Interface: 80300
-## Notes: Interface for running a Loot Council v2.18.0
+## Notes: Interface for running a Loot Council v2.18.1
 ## Title: RCLootCouncil
-## Version: 2.18.0
+## Version: 2.18.1
 ## SavedVariables: RCLootCouncilDB, RCLootCouncilLootDB
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, lib-st, LibWindow-1.1, LibDialog-1.0
 

diff --git a/changelog.md b/changelog.md
@@ -37,6 +37,7 @@ When enabled, it functions exactly as it did before.
 
 ## Bugfixes
 * *Candidate info no longer has the potential to wait a long time before being sync, i.e. guild rank not showing up in the voting frame.*
+* *2.18.1: Previous version would error out when awarding during tests.*
 
 
 #### Dev

diff --git a/ml_core.lua b/ml_core.lua
@@ -1253,7 +1253,7 @@ RCLootCouncilML.awardStrings = {
 	["&o"] = function(...)
 		local session = select(5, ...)
 		local owner = select(6, ...) or RCLootCouncilML.lootTable[session] and  RCLootCouncilML.lootTable[session].owner
-		return addon.Ambiguate(owner) or _G.UNKNOWN end,
+		return owner and addon.Ambiguate(owner) or _G.UNKNOWN end,
 	["&m"] = function(...) return addon:GetActiveModule("votingframe"):GetCandidateData(select(5,...), select(1,...), "note") or "<none>" end,
 }