Merge pull request #10 from AmonRay/main

make toasts great again

ElvUI.toc

@@ -1,6 +1,6 @@
 ## Interface: 30300
 ## Author: Elv, Bunny, fxpw
-## Version: 7.60
+## Version: 7.61
 ## Title: |cff1784d1E|r|cffe5e3e3lvUI|r for sirus
 ## Notes: User Interface replacement AddOn for World of Warcraft.
 ## SavedVariables: ElvDB, ElvPrivateDB, ElvSirusDB

Modules/Tooltip/Tooltip.lua

@@ -800,19 +800,22 @@ function TT:Initialize()
 		TT:SecureHook(SocialToastFrame, "SetPoint", "RepositionSocialToast")
 	elseif SocialToastAnchorFrame then
 		hooksecurefunc(SocialToastAnchorFrame, "ShowToast", function(self)
-			if self.toastFrames then
-				for _, toastFrame in ipairs(self.toastFrames) do
-					if not toastFrame.isSkinned then
-						toastFrame:SetTemplate("Transparent")
-						S:HandleIcon(toastFrame.Icon)
-						toastFrame.backdrop:SetFrameLevel(toastFrame:GetFrameLevel() + 2)
-						toastFrame.Icon:SetParent(toastFrame.backdrop)
-						S:HandleCloseButton(toastFrame.CloseButton)
-
-						toastFrame.isSkinned = true
+			if type(self) == "table" then
+				if self.activeToasts and type(self.activeToasts) == "table" then
+					for _, toastFrame in pairs(self.activeToasts) do
+						if type(toastFrame) == "table" then
+							if not toastFrame.isSkinned then
+								toastFrame:SetTemplate("Transparent")
+								S:HandleIcon(toastFrame.Icon)
+								toastFrame.backdrop:SetFrameLevel(toastFrame:GetFrameLevel() + 2)
+								toastFrame.Icon:SetParent(toastFrame.backdrop)
+								S:HandleCloseButton(toastFrame.CloseButton)
+
+								toastFrame.isSkinned = true
+							end
+							toastFrame.Icon:SetTexCoord(unpack(E.TexCoords))
+						end
 					end
-
-					toastFrame.Icon:SetTexCoord(unpack(E.TexCoords))
 				end
 			end
 		end)