fix: #2311 error caused by IconModule_IconEventConditionHandler enabling unconditionally

Author: ascott18

.vscode/settings.json

@@ -238,7 +238,41 @@
         "LE_REALM_RELATION_COALESCED",
         "ERR_PETITION_NOT_SAME_SERVER",
         "GetUnitName",
-        "GENERAL"
+        "GENERAL",
+        "LOSS_OF_CONTROL_DISPLAY_BANISH",
+        "LOSS_OF_CONTROL_DISPLAY_CHARM",
+        "LOSS_OF_CONTROL_DISPLAY_CYCLONE",
+        "LOSS_OF_CONTROL_DISPLAY_DISARM",
+        "LOSS_OF_CONTROL_DISPLAY_DISORIENT",
+        "LOSS_OF_CONTROL_DISPLAY_DISTRACT",
+        "LOSS_OF_CONTROL_DISPLAY_FREEZE",
+        "LOSS_OF_CONTROL_DISPLAY_HORROR",
+        "LOSS_OF_CONTROL_DISPLAY_INCAPACITATE",
+        "LOSS_OF_CONTROL_DISPLAY_INTERRUPT",
+        "LOSS_OF_CONTROL_DISPLAY_INVULNERABILITY",
+        "LOSS_OF_CONTROL_DISPLAY_MAGICAL_IMMUNITY",
+        "LOSS_OF_CONTROL_DISPLAY_PACIFY",
+        "LOSS_OF_CONTROL_DISPLAY_PACIFYSILENCE",
+        "LOSS_OF_CONTROL_DISPLAY_POLYMORPH",
+        "LOSS_OF_CONTROL_DISPLAY_POSSESS",
+        "LOSS_OF_CONTROL_DISPLAY_SAP",
+        "LOSS_OF_CONTROL_DISPLAY_SHACKLE_UNDEAD",
+        "LOSS_OF_CONTROL_DISPLAY_SLEEP",
+        "LOSS_OF_CONTROL_DISPLAY_TURN_UNDEAD",
+        "LOSS_OF_CONTROL_DISPLAY_ROOT",
+        "LOSS_OF_CONTROL_DISPLAY_CONFUSE",
+        "LOSS_OF_CONTROL_DISPLAY_STUN",
+        "LOSS_OF_CONTROL_DISPLAY_SILENCE",
+        "LOSS_OF_CONTROL_DISPLAY_FEAR",
+        "SPELL_SCHOOL0_CAP",
+        "SPELL_SCHOOL1_CAP",
+        "SPELL_SCHOOL2_CAP",
+        "SPELL_SCHOOL3_CAP",
+        "SPELL_SCHOOL4_CAP",
+        "SPELL_SCHOOL5_CAP",
+        "SPELL_SCHOOL6_CAP",
+        "LOSS_OF_CONTROL_DISPLAY_INTERRUPT_SCHOOL",
+        "CallErrorHandler"
     ],
     "Lua.type.weakUnionCheck": true
 }

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v11.2.9
+* Fix: #2311 error caused by IconModule_IconEventConditionHandler enabling unconditionally
+
 ## v11.2.8
 * Fix #2310 spec checking broken below level 10 on Classic Era.
 

Components/Core/IconView.lua

@@ -352,9 +352,9 @@ IconView:ImplementsModule("GroupModule_GroupPosition", 1, true)
 IconView:ImplementsModule("GroupModule_Alpha", 1.5, true)
 
 IconView:ImplementsModule("IconModule_Self", 0, true)
-IconView:ImplementsModule("IconModule_IconEventClickHandler", 2, true)
+IconView:ImplementsModule("IconModule_IconEventClickHandler", 2, nil)
 IconView:ImplementsModule("IconModule_IconEventOtherShowHideHandler", 2.5, true)
-IconView:ImplementsModule("IconModule_IconEventConditionHandler", 2.7, true)
+IconView:ImplementsModule("IconModule_IconEventConditionHandler", 2.7, nil)
 IconView:ImplementsModule("IconModule_RecieveSpellDrags", 3, true)
 IconView:ImplementsModule("IconModule_IconDragger", 4, true)
 IconView:ImplementsModule("IconModule_GroupMover", 5, true)

Components/IconModules/IconModule_IconEventConditionHandler/IconEventConditionHandler.lua

@@ -20,7 +20,6 @@ local print = TMW.print
 local UpdateManager = TMW.Classes.UpdateTableManager:New()
 UpdateManager:UpdateTable_Set()
 local ByConditionObject = UpdateManager:UpdateTable_CreateIndexedView("ByConditionObject", function(target) return target.ConditionObject end)
-local ByEventSettingsProxy = UpdateManager:UpdateTable_CreateIndexedView("ByEventSettingsProxy", function(target) return target.eventSettingsProxy end)
 local ByIcon = UpdateManager:UpdateTable_CreateIndexedView("ByIcon", function(target) return target.icon end)
 
 local Module = TMW:NewClass("IconModule_IconEventConditionHandler", "IconModule")

Options/CHANGELOG.lua

@@ -3,6 +3,9 @@ if not TMW then return end
 TMW.CHANGELOG_LASTVER="10.0.0"
 
 TMW.CHANGELOG = [==[
+## v11.2.9
+* Fix: #2311 error caused by IconModule_IconEventConditionHandler enabling unconditionally
+
 ## v11.2.8
 * Fix #2310 spec checking broken below level 10 on Classic Era.
 

TellMeWhen.lua

@@ -515,49 +515,14 @@ local print = TMW.print
 
 
 do	-- TMW.safecall
-	--[[
-		xpcall safecall implementation
-	]]
 	local xpcall = xpcall
 
-	local function errorhandler(err)
-		return geterrorhandler()(err)
-	end
-
-	local function CreateDispatcher(argCount)
-		local code = [[
-			local xpcall, eh = ...
-			local method, ARGS
-			local function call() return method(ARGS) end
-		
-			local function dispatch(func, ...)
-				method = func
-				if not method then return end
-				ARGS = ...
-				return xpcall(call, eh)
-			end
-		
-			return dispatch
-		]]
-		
-		local ARGS = {}
-		for i = 1, argCount do ARGS[i] = "arg"..i end
-		ARGS = table.concat(ARGS, ", ")
-		code = code:gsub("ARGS", ARGS)
-		return assert(loadstring(code, "safecall Dispatcher["..argCount.."]"))(xpcall, errorhandler)
-	end
-
-	local Dispatchers = setmetatable({}, {__index=function(self, argCount)
-		local dispatcher = CreateDispatcher(argCount)
-		rawset(self, argCount, dispatcher)
-		return dispatcher
-	end})
-	Dispatchers[0] = function(func)
-		return xpcall(func, errorhandler)
+	local errorhandler = _G.CallErrorHandler or function(...)
+		return geterrorhandler()(...)
 	end
 
 	function TMW.safecall(func, ...)
-		return Dispatchers[select('#', ...)](func, ...)
+		return xpcall(func, errorhandler, ...)
 	end
 end
 local safecall = TMW.safecall

TellMeWhen.toc

@@ -18,7 +18,7 @@
 ## X-WoWI-ID: 10855
 ## X-Wago-ID: ZQ6aZqKW
 
-## Version: 11.2.8
+## Version: 11.2.9
 ## Author: Cybeloras of Aerie Peak
 ## IconTexture: Interface\Addons\TellMeWhen\Textures\LDB Icon
 ## AddonCompartmentFunc: TellMeWhen_OnAddonCompartmentClick