Attempt to fix IsShown() erroring on UpdateInRange

brittyazel · Dec 23, 2023 · d83f1fe · d83f1fe
1 parent cbe70a9
commit d83f1fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/Overrides.lua b/Overrides.lua
@@ -100,7 +100,7 @@ end
 --- This function is secure hooked to the CompactUnitFrame_UpdateInRange function.
 ---@param frame table @The frame to update the alpha on
 function EnhancedRaidFrames:UpdateInRange(frame)
-	if not self.ShouldContinue(frame) then
+	if not self.ShouldContinue(frame, true) then
 		return
 	end
 

diff --git a/Utils/Utilities.lua b/Utils/Utilities.lua
@@ -23,25 +23,26 @@ function EnhancedRaidFrames.ShouldContinue(frame, skipVisibilityCheck)
 		return false
 	end
 
+	-- Check that we have a unit, and only process player, raid, and party units
+	if not frame.unit or (not frame.unit:find("player", 1, true)
+			and not frame.unit:find("raid", 1, true)
+			and not frame.unit:find("party", 1, true)) then
+		return false
+	end
+
 	-- Check that we have a frame and that it is visible
 	if not skipVisibilityCheck then
 		-- Don't do any work if the raid frames aren't shown
 		if not CompactRaidFrameContainer:IsShown() and CompactPartyFrame and not CompactPartyFrame:IsShown() then
 			return false
 		end
 
-		if frame and not frame:IsShown() then
+		-- Don't do any work if the frame isn't shown
+		if not frame:IsShown() then
 			return false
 		end
 	end
 
-	-- Check that we have a unit, and only process player, raid, and party units
-	if not frame.unit or (not frame.unit:find("player", 1, true)
-			and not frame.unit:find("raid", 1, true)
-			and not frame.unit:find("party", 1, true)) then
-		return false
-	end
-
 	return true
 end