Skip to content

Commit

Permalink
Fix Advanced Item Description error popup problems (#8311)
Browse files Browse the repository at this point in the history
* show as warning, once per session

* move to keypress handling code
  • Loading branch information
Nightblade authored Sep 26, 2024
1 parent 8369b44 commit f6d095a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/Classes/Item.lua
Original file line number Diff line number Diff line change
Expand Up @@ -298,10 +298,6 @@ function ItemClass:ParseRaw(raw, rarity, highQuality)
self.rawLines = { }
-- Find non-blank lines and trim whitespace
for line in raw:gmatch("%s*([^\n]*%S)") do
if line:match("^{ ") then
main:OpenMessagePopup("Error", "\"Advanced Item Description\" (Ctrl+Alt+c) is currently unsupported.\nPlease try again using Ctrl+c only.")
return
end
t_insert(self.rawLines, line)
end
local mode = rarity and "GAME" or "WIKI"
Expand Down
5 changes: 5 additions & 0 deletions src/Classes/ItemsTab.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1170,6 +1170,11 @@ function ItemsTabClass:Draw(viewPort, inputEvents)
if event.type == "KeyDown" then
if event.key == "v" and IsKeyDown("CTRL") then
local newItem = Paste()
if newItem:find("{ ", 0, true) then
main:OpenConfirmPopup("Warning", "\"Advanced Item Descriptions\" (Ctrl+Alt+c) are unsupported.\n\nAbort paste?", "OK", function()
self:SetDisplayItem()
end)
end
if newItem then
self:CreateDisplayItemFromRaw(newItem, true)
end
Expand Down

0 comments on commit f6d095a

Please sign in to comment.