fix: fixed StaticPopup_Show hook + dismiss loop throwing errors

Author: sampconrad

CombatMode/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/2.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.3.3] - 2026-08-20
+
+### Fixed
+
+- Fixed issue where upgrading items would cause a Lua error due to `StaticPopup_Show` hook + dismiss loop.
+
 ## [4.3.2] - 2026-08-20
 
 ### Fixed
@@ -358,7 +364,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Reticle Targeting blacklist not excluding spells from targeting macro injection, which broke Hold To Cast and empowered spell options (e.g. Hold & Release). Excluding a spell by name on the list now restores expected behavior.
 
-[Unreleased]: https://github.com/djsmithdev/combatmode/compare/4.3.2...HEAD
+[Unreleased]: https://github.com/djsmithdev/combatmode/compare/4.3.3...HEAD
+[4.3.3]: https://github.com/djsmithdev/combatmode/compare/4.3.2...4.3.3
 [4.3.2]: https://github.com/djsmithdev/combatmode/compare/4.3.1...4.3.2
 [4.3.1]: https://github.com/djsmithdev/combatmode/compare/4.3.0...4.3.1
 [4.3.0]: https://github.com/djsmithdev/combatmode/compare/4.2.1...4.3.0

CombatMode/CombatMode.toc

@@ -1,5 +1,5 @@
 ## Interface: 120100
-## Version: 4.3.2
+## Version: 4.3.3
 
 ## Title: |A:::|a|TInterface\Addons\CombatMode\assets\cmtitle:22:95|t
 ## Notes: Combat Mode brings modern action-game controls to World of Warcraft, replacing traditional tab-targeting with intuitive aiming, more engaging controls, and immersive combat.

CombatMode/Core/Runtime/Bootstrap.lua

@@ -27,30 +27,21 @@ local GetCurrentBindingSet = _G.GetCurrentBindingSet
 local GetMacroInfo = _G.GetMacroInfo
 local SaveBindings = _G.SaveBindings
 local SetBinding = _G.SetBinding
+local UIParent = _G.UIParent
 
 -- Lua stdlib
 local pairs = _G.pairs
 
 -- Suppress the experimental CVar confirmation popup so Action Camera CVars
 -- don't trigger a dialog on every login/reload. CM sets experimental CVars
 -- (e.g. test_cameraHeadMovementStrength) intentionally for the Action Camera
--- feature, so the warning is noise. We hook StaticPopup_Show directly because
--- UIParent registers for EXPERIMENTAL_CVAR_CONFIRMATION_NEEDED during Blizzard
--- init and its OnEvent fires before any addon-created frame can react.
-local origShow = _G.StaticPopup_Show
-_G.StaticPopup_Show = function(which, ...)
-  if which == "EXPERIMENTAL_CVAR_WARNING" then
-    return nil
-  end
-  return origShow(which, ...)
-end
--- Dismiss any popup already on screen from earlier in this session (edge case:
--- e.g. a previous /reload where the popup was already queued).
-for i = 1, _G.STATICPOPUP_NUMDIALOGS or 20 do
-  local popup = _G["StaticPopup" .. i]
-  if popup and popup:IsShown() and popup.which == "EXPERIMENTAL_CVAR_WARNING" then
-    popup:Hide()
-  end
+-- feature, so the warning is noise.
+-- WoW 12.1 moved this event out of UIParent into Blizzard_Game's internal
+-- event router. Use GameEvent.UnregisterInternalEvent when available.
+if _G.GameEvent and _G.GameEvent.UnregisterInternalEvent then
+  _G.GameEvent.UnregisterInternalEvent("EXPERIMENTAL_CVAR_CONFIRMATION_NEEDED")
+else
+  UIParent:UnregisterEvent("EXPERIMENTAL_CVAR_CONFIRMATION_NEEDED")
 end
 
 local function CreateTargetMacros()

CombatMode/UI/Changelog/ChangelogData.lua

@@ -14,6 +14,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/2.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.3.3] - 2026-08-20
+
+### Fixed
+
+- Fixed issue where upgrading items would cause a Lua error due to `StaticPopup_Show` hook + dismiss loop.
+
 ## [4.3.2] - 2026-08-20
 
 ### Fixed
@@ -367,7 +373,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Reticle Targeting blacklist not excluding spells from targeting macro injection, which broke Hold To Cast and empowered spell options (e.g. Hold & Release). Excluding a spell by name on the list now restores expected behavior.
 
-[Unreleased]: https://github.com/djsmithdev/combatmode/compare/4.3.2...HEAD
+[Unreleased]: https://github.com/djsmithdev/combatmode/compare/4.3.3...HEAD
+[4.3.3]: https://github.com/djsmithdev/combatmode/compare/4.3.2...4.3.3
 [4.3.2]: https://github.com/djsmithdev/combatmode/compare/4.3.1...4.3.2
 [4.3.1]: https://github.com/djsmithdev/combatmode/compare/4.3.0...4.3.1
 [4.3.0]: https://github.com/djsmithdev/combatmode/compare/4.2.1...4.3.0