From 38617deb6793a022874e120a1cdfd4a5912fd744 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Sat, 7 Sep 2024 21:29:03 -0700 Subject: [PATCH] fix: #2125 - "script ran too long" when zoning into instances. --- CHANGELOG.md | 1 + Options/CHANGELOG.lua | 1 + TellMeWhen.lua | 10 ++++------ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbab4177..b77cb338 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## v11.0.7 * #1857 - Add LibCustomGlow animations. * #2144 - TMW now accounts for adjusted-rate cooldowns and auras (e.g. timer freezes caused by talents or boss mechanics). +* Fix: #2125 - "script ran too long" when zoning into instances. * Fix: #2191 - Icon Shown condition ignoring Shown/Hidden checkboxes for disabled icons/groups. * Fix: #2193 - Icon overlay and border animations starting in the wrong state. * Fix: #2215 - Spell Charges condition not updating for countable spells without true charges. diff --git a/Options/CHANGELOG.lua b/Options/CHANGELOG.lua index e9e95bde..96621ce7 100644 --- a/Options/CHANGELOG.lua +++ b/Options/CHANGELOG.lua @@ -6,6 +6,7 @@ TMW.CHANGELOG = [==[ ## v11.0.7 * #1857 - Add LibCustomGlow animations. * #2144 - TMW now accounts for adjusted-rate cooldowns and auras (e.g. timer freezes caused by talents or boss mechanics). +* Fix: #2125 - "script ran too long" when zoning into instances. * Fix: #2191 - Icon Shown condition ignoring Shown/Hidden checkboxes for disabled icons/groups. * Fix: #2193 - Icon overlay and border animations starting in the wrong state. * Fix: #2215 - Spell Charges condition not updating for countable spells without true charges. diff --git a/TellMeWhen.lua b/TellMeWhen.lua index 73ba64f0..0c5c60bd 100644 --- a/TellMeWhen.lua +++ b/TellMeWhen.lua @@ -2865,12 +2865,10 @@ end -- TMW:Update() sets up all groups, icons, and anything else. function TMW:Update(forceCoroutine) - -- We check arena (and I threw BGs in as well) - -- in hopes of resolving https://wow.curseforge.com/projects/tellmewhen/issues/1572 - - -- a "script ran too long" error that appears to be happening outside of combat, - -- potentially when loading into an arena map. - local _, z = IsInInstance() - local needsCoroutineUpdate = forceCoroutine or InCombatLockdown() or z == "arena" or z == "pvp" + -- We check for instances to resolve https://github.com/ascott18/TellMeWhen/issues/1592 + -- and https://github.com/ascott18/TellMeWhen/issues/2125 - "script ran too long" errors + -- that appears to be happening outside of combat when loading into an instance. + local needsCoroutineUpdate = forceCoroutine or InCombatLockdown() or IsInInstance() if needsCoroutineUpdate then TMW:UpdateViaCoroutine()