Fix a nil on first open if the merchant is laggy, update TOC for 11.1…

… PTR
kstange · Jan 13, 2025 · fdc0a50 · fdc0a50
1 parent b50ce6f
commit fdc0a50
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,37 +1,7 @@
-# Version 11.0.7.0
+# Version 11.1.0.0
 
-- Updated TOC for Retail 11.0.7
-- Added Expansion merchant column that shows which expansion items are associated with
-- Added an option to show the stack size after the name of each item
-- Added a new section for Column Options to make room for options that are coming soon
-- Added some invalid pets from the Anniversary event to the filter list
-- Fixed a logic error when sorting that could sort in reverse incorrectly
-
-# Version 11.0.5.1
-
-- Fixed handling of temporary mounts like Magic Broom that can't be collected
-
-# Version 11.0.5.0
-
-- Updated TOC for Retail 11.0.5
-- Added koKR (Korean) translation (hinski)
-
-# Version 11.0.2.0
-
-- Fixed a failure when switching from the Buyback tab, buying a merchant item, then trying to buy another one
-- Fixed an issue where after buying back an item from the Buyback tab, then buying a merchant item, the quick buyback button would no longer display the correct item
-- Fixed an issue where a buyback price could appear on the quick buyback button even though default UI no longer supports it
-- Removed compatibility code related to Dragonflight
-
-# Version 11.0.0.1
-
-- Added an option to set the width of the merchant window
-- Changed equipment that a character can't equip to appear as collectable instead of restricted
-- Fixed detection of collectable toys that are in the Consumable category instead of Miscellaneous
-
-# Version 11.0.0.0
-
-- Updated TOC for Retail 11.0.2 (beta)
+- Updated TOC for Retail 11.1.0 (PTR)
+- Fix an error that sometimes occurs upon opening the first merchant per session
 
 # Release History
 

diff --git a/DisplayFunctions.lua b/DisplayFunctions.lua
@@ -20,7 +20,7 @@ Display.CollectableState = {}
 
 -- This display function returns the icon and display name for the merchant item
 function Display:Item(data, options)
-	local name = data.name
+	local name = data.name or ""
 	local quality = data.quality
 	local quantity = data.quantity
 	local texture = data.texture

diff --git a/MerchantPlus.toc b/MerchantPlus.toc
@@ -1,4 +1,4 @@
-## Interface: 110007, 110005
+## Interface: 110100, 110007
 ## Version: @project-version@
 ## Title: Merchant Plus
 ## Notes: A Modern Scrollable UI for Merchants