11.0.5 (57292)

Gethe · Oct 29, 2024 · 0290545 · 0290545
1 parent 0988277
commit 0290545
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/Interface/AddOns/Blizzard_Deprecated_ArenaUI/Blizzard_Deprecated_ArenaUI.toc b/Interface/AddOns/Blizzard_Deprecated_ArenaUI/Blizzard_Deprecated_ArenaUI.toc
@@ -1,6 +1,6 @@
 ## Title: Blizzard_Deprecated_ArenaUI
 ## Author: Blizzard Entertainment
 ## DefaultState: enabled
-## Dependencies: Blizzard_UnitFrame
+## Dependencies: Blizzard_UnitFrame, Blizzard_DurabilityFrame
 ## AllowLoad: Game
 Deprecated_ArenaUI.xml
diff --git a/Interface/AddOns/Blizzard_GroupFinder/Mainline/LFDFrame.lua b/Interface/AddOns/Blizzard_GroupFinder/Mainline/LFDFrame.lua
@@ -500,8 +500,16 @@ function LFDQueueFrame_SetType(value)
 	LFDQueueFrame.TypeDropdown:GenerateMenu();
 end
 
+local function ResetLFDBackgroundToDefaultSizing()
+	LFDQueueFrameBackground:ClearAllPoints();
+	LFDQueueFrameBackground:SetWidth(512);
+	LFDQueueFrameBackground:SetHeight(256);
+	LFDQueueFrameBackground:SetPoint("BOTTOMLEFT", LFDQueueFrameBackground:GetParent(), "BOTTOMLEFT", 6, 26);
+end
+
 function LFDQueueFrame_SetTypeRandomDungeon(hideCooldown)
 	LFDQueueFrameBackground:SetTexture("Interface\\LFGFrame\\UI-LFG-BACKGROUND-QUESTPAPER")
+	ResetLFDBackgroundToDefaultSizing();
 	LFDQueueFrameSpecific:Hide();
 	LFDQueueFrameFollower:Hide();
 	LFDQueueFrameRandom:Show();
@@ -510,6 +518,7 @@ end
 
 function LFDQueueFrame_SetTypeSpecificDungeon()
 	LFDQueueFrameBackground:SetTexture("Interface\\LFGFrame\\UI-LFG-BACKGROUND-DUNGEONWALL");
+	ResetLFDBackgroundToDefaultSizing();
 	LFDQueueFrameRandom:Hide();
 	LFDQueueFrameFollower:Hide();
 	LFDQueueFrameSpecific:Show();
@@ -518,6 +527,7 @@ end
 
 function LFDQueueFrame_SetTypeFollowerDungeon()
 	LFDQueueFrameBackground:SetTexture("Interface\\LFGFrame\\UI-LFG-BACKGROUND-DUNGEONWALL");
+	ResetLFDBackgroundToDefaultSizing();
 	LFDQueueFrameRandom:Hide();
 	LFDQueueFrameSpecific:Hide();
 	LFDQueueFrameFollower:Show();

diff --git a/Interface/AddOns/Blizzard_ProfessionsTemplates/Blizzard_ProfessionsTemplates.lua b/Interface/AddOns/Blizzard_ProfessionsTemplates/Blizzard_ProfessionsTemplates.lua
@@ -387,18 +387,19 @@ function ProfessionsCrafterTableCellItemNameMixin:Populate(rowData, dataIndex)
 
 	local item;
 
+	local baseItemID = order.itemID;
 	if order.reagents and #order.reagents > 0 then
 		-- Customer provided finishing reagents can alter the quality of the output item.
 		-- Calculate the exact item output based on these reagents so that quality is correct.
 		local transaction = ProfessionsUtil.CreateProfessionsRecipeTransactionFromCraftingOrder(order);
 		local outputItemInfo = C_TradeSkillUI.GetRecipeOutputItemData(transaction:GetRecipeID(), transaction:CreateCraftingReagentInfoTbl());
 		item = Item:CreateFromItemLink(outputItemInfo.hyperlink);
 	else
-		item = Item:CreateFromItemID(order.itemID);
+		item = Item:CreateFromItemID(baseItemID);
 	end
 
 	item:ContinueOnItemLoad(function()
-		if item:GetItemID() ~= self.rowData.option.itemID then
+		if baseItemID ~= self.rowData.option.itemID then
 			-- Callback from a previous async request
 			return;
 		end