Merge remote-tracking branch 'fork/master'

classes/class_damage.lua

@@ -2028,7 +2028,7 @@ function damageClass:RefreshWindow(instanceObject, combatObject, bForceUpdate, b
 											this_spell [2] = this_spell [2] + on_player
 											total = total + on_player
 										else
-											error("error - no spell id for DTBS friendly fire " .. spellid)
+											--error("error - no spell id for DTBS friendly fire " .. spellid)
 										end
 									end
 								end
@@ -3769,6 +3769,11 @@ function damageClass:ToolTip_DamageDone (instancia, numero, barra, keydown)
 				local petDPS = damageTable[3]
 
 				petName = damageTable[1]:gsub(("%s%<.*"), "")
+
+				if (instance.row_info.textL_translit_text) then
+					petName = Translit:Transliterate(petName, "!")
+				end
+
 				if (instancia.sub_atributo == 1) then
 					GameCooltip:AddLine(petName, FormatTooltipNumber(_, petDamageDone) .. " (" .. math.floor(petDamageDone/self.total*100) .. "%)")
 				else

classes/class_utility.lua

@@ -212,6 +212,15 @@ function Details.ShowDeathTooltip(instance, lineFrame, combatObject, deathTable)
 
 		local evType = event[1]
 		local spellName, _, spellIcon = _GetSpellInfo(event[2])
+
+		if (not spellName) then
+			spellName = _G.UNKNOWN
+		end
+
+		if (not spellIcon) then
+			spellIcon = [[Interface\ICONS\INV_MISC_QUESTIONMARK]]
+		end
+
 		local amount = event[3]
 		local eventTime = event[4]
 		local source = Details:GetOnlyName(event[6] or "")

classes/container_segments.lua

@@ -916,7 +916,10 @@ function segmentClass:ResetAllCombatData()
 		for i = #segmentsTable, 1, -1 do
 			---@type combat
 			local thisCombatObject = segmentsTable[i]
-			Details:DestroyCombat(thisCombatObject)
+			--check if the combat is already destroyed
+			if (not thisCombatObject.__destroyed) then
+				Details:DestroyCombat(thisCombatObject)
+			end
 		end
 
 		--the current combat when finished will be moved to the first index of "segmentsTable", need the check if the current combat was already destroyed