Merge branch 'dev'

ls- · Jul 31, 2024 · 8a25425 · 8a25425
2 parents e8d2ff3 + c8a4d42
commit 8a25425
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## Version 110000.02
+
+- Fixed "[DNT] Worldsoul Memory Score" toasts.
+
 ## Version 110000.01
 
 - Added 11.0.0 support.

diff --git a/ls_Toasts/core/changelog.lua b/ls_Toasts/core/changelog.lua
@@ -6,5 +6,5 @@ local _G = getfenv(0)
 
 -- Mine
 E.CHANGELOG = [[
-- Added 11.0.0 support.
+- Fixed "[DNT] Worldsoul Memory Score" toasts.
 ]]
diff --git a/ls_Toasts/embeds/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua b/ls_Toasts/embeds/AceConfig-3.0/AceConfigDialog-3.0/AceConfigDialog-3.0.lua
@@ -7,7 +7,7 @@ local LibStub = LibStub
 local gui = LibStub("AceGUI-3.0")
 local reg = LibStub("AceConfigRegistry-3.0")
 
-local MAJOR, MINOR = "AceConfigDialog-3.0", 86
+local MAJOR, MINOR = "AceConfigDialog-3.0", 87
 local AceConfigDialog, oldminor = LibStub:NewLibrary(MAJOR, MINOR)
 
 if not AceConfigDialog then return end
@@ -544,6 +544,7 @@ local function GetFuncName(option)
 	end
 end
 do
+	local InCombatLockdown = InCombatLockdown
 	local frame = AceConfigDialog.popup
 	if not frame or oldminor < 81 then
 		frame = CreateFrame("Frame", nil, UIParent)
@@ -556,13 +557,15 @@ do
 		frame:SetFrameLevel(100) -- Lots of room to draw under it
 		frame:SetScript("OnKeyDown", function(self, key)
 			if key == "ESCAPE" then
-				self:SetPropagateKeyboardInput(false)
+				if not InCombatLockdown() then
+					self:SetPropagateKeyboardInput(false)
+				end
 				if self.cancel:IsShown() then
 					self.cancel:Click()
 				else -- Showing a validation error
 					self:Hide()
 				end
-			else
+			elseif not InCombatLockdown() then
 				self:SetPropagateKeyboardInput(true)
 			end
 		end)

diff --git a/ls_Toasts/embeds/LibSharedMedia-3.0/lib.xml b/ls_Toasts/embeds/LibSharedMedia-3.0/lib.xml
@@ -0,0 +1,4 @@
+<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/
+..\FrameXML\UI.xsd">
+	<Script file="LibSharedMedia-3.0.lua" />
+</Ui>
diff --git a/ls_Toasts/embeds/_embeds.xml b/ls_Toasts/embeds/_embeds.xml
@@ -5,7 +5,7 @@
 	<Include file="AceDBOptions-3.0\AceDBOptions-3.0.xml"/>
 	<Include file="AceGUI-3.0\AceGUI-3.0.xml"/>
 	<Include file="AceConfig-3.0\AceConfig-3.0.xml"/>
-	<Script file="LibSharedMedia-3.0\LibSharedMedia-3.0.lua"/>
+	<Include file="LibSharedMedia-3.0\lib.xml"/>
 	<Include file="AceGUI-3.0-SharedMediaWidgets\widget.xml"/>
 	<Include file="AceGUI-3.0-LSWidgets\_widgets.xml"/>
 </Ui>
diff --git a/ls_Toasts/ls_Toasts.toc b/ls_Toasts/ls_Toasts.toc
@@ -1,6 +1,6 @@
 ## Interface: 110000, 110002
 ## Author: lightspark
-## Version: 110000.01
+## Version: 110000.02
 ## Title: LS: |cff00cc99Toasts|r
 ## Notes: Better toasts, cheers!
 ## IconTexture: Interface\AddOns\ls_Toasts\assets\logo-64

diff --git a/ls_Toasts/systems/loot_currency.lua b/ls_Toasts/systems/loot_currency.lua
@@ -870,7 +870,7 @@ local BLACKLIST = {
 	[2808] = true, -- Drake's Awakened Crest
 	[2810] = true, -- Wyrm's Awakened Crest
 	[2811] = true, -- Aspect's Awakened Crest
-	[2813] = true, -- Harmonzed Silk
+	[2813] = true, -- Harmonized Silk
 	[2814] = true, -- Renown-Keg Leg's Crew
 	[2819] = true, -- Azerothian Archives
 	[2822] = true, -- [DNT] Corgi Cache
@@ -1061,6 +1061,7 @@ local BLACKLIST = {
 	[3099] = true, -- 11.0 Raid - Nerubian - Nerubar Finery Tracking Currency (Hidden)
 	[3103] = true, -- 11.0 Delves - System - Seasonal Affix - Events Active
 	[3104] = true, -- 11.0 Delves - System - Seasonal Affix - Events Maximum
+	[3115] = true, -- [DNT] Worldsoul Memory Score
 }
 
 local MULT = {