Fix error when using an invalid spell with a custom bar on 11.x

changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+v1.15.5:
+
+- Fix error when using an invalid spell with a custom bar on 11.x
+
 v1.15.4:
 
 - Update TOC for TWW

modules/CustomBar.lua

@@ -20,9 +20,15 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
+		if info then
 			return info.name, nil, info.iconID
 		end
+	end
 end
 
 IceCustomBar.prototype.auraDuration = -1

modules/CustomCDBar.lua

@@ -30,9 +30,15 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
+		if info then
 			return info.name, nil, info.iconID
 		end
+	end
 end
 
 local GetSpellCooldown = GetSpellCooldown

modules/CustomCounterBar.lua

@@ -10,9 +10,15 @@ local DefaultAuraIcon = "Interface\\Icons\\Spell_Frost_Frost"
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
+		if info then
 			return info.name, nil, info.iconID
 		end
+	end
 end
 
 function IceCustomCounterBar.prototype:init()

modules/GlobalCoolDown.lua

@@ -9,9 +9,15 @@ end
 local GetSpellInfo = GetSpellInfo
 if not GetSpellInfo and C_Spell and C_Spell.GetSpellInfo then
 	GetSpellInfo = function(id)
+		if not id then
+			return nil
+		end
+
 		local info = C_Spell.GetSpellInfo(id)
+		if info then
 			return info.name, nil, info.iconID, info.castTime
 		end
+	end
 end
 
 local GetSpellCooldown = GetSpellCooldown

this_version.md

@@ -1,5 +1,9 @@
 # Changelog
 
+v1.15.5:
+
+- Fix error when using an invalid spell with a custom bar on 11.x
+
 v1.15.4:
 
 - Update TOC for TWW