Merge branch 'main' into ptr

tukui-org · Jan 18, 2025 · 0401d44 · 0401d44
2 parents d080586 + 13eb700
commit 0401d44
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/ElvUI_Libraries/Core/LibAnim/LibAnim.lua b/ElvUI_Libraries/Core/LibAnim/LibAnim.lua
@@ -1,5 +1,5 @@
 -- LibAnim by Hydra
-local Version = 2.902 -- based on 2.03
+local Version = 2.903 -- based on 2.03
 
 -- Note, deprecated items will be removed next version.
 -- Please update your usage accordingly. (ctrl + f - "Deprecated")

diff --git a/ElvUI_Libraries/Core/oUF/ouf.lua b/ElvUI_Libraries/Core/oUF/ouf.lua
@@ -9,7 +9,7 @@ local Private = Profiler(oUF).Private
 
 local argcheck = Private.argcheck
 local error = Private.error
-local print = Private.print --luacheck: no unused
+local print = Private.print -- luacheck: no unused
 local unitExists = Private.unitExists
 
 local styles, style = {}

diff --git a/ElvUI_Libraries/Core/oUF/simpy/profiler.lua b/ElvUI_Libraries/Core/oUF/simpy/profiler.lua
@@ -5,6 +5,7 @@ local Private = oUF.Private
 -- ElvUI_CPU knock off by Simpy (STILL UNFINISHED)
 
 local type = type
+local next = next
 local wipe = wipe
 local rawset = rawset
 local unpack = unpack

diff --git a/ElvUI_Options/Core/General.lua b/ElvUI_Options/Core/General.lua
@@ -18,9 +18,12 @@ local FCF_GetNumActiveChatFrames = FCF_GetNumActiveChatFrames
 local ChatTabInfo = {}
 local function GetChatWindowInfo()
 	wipe(ChatTabInfo)
-	for i = 1, FCF_GetNumActiveChatFrames() do
+
+	local numActive = FCF_GetNumActiveChatFrames() or 0
+	for i = 1, numActive do
 		ChatTabInfo['ChatFrame'..i] = _G['ChatFrame'..i..'Tab']:GetText()
 	end
+
 	return ChatTabInfo
 end