update Cargo.lock for 1.4.1

Author: ZeWaka

lib/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "aseprite-dmi"
-version = "1.4.0"
+version = "1.4.1"
 edition = "2021"
 repository = "https://github.com/spacestation13/aseprite-dmi"
 

lib/Cargo.toml

@@ -2,7 +2,7 @@
 	"name": "asprite-dmi",
 	"displayName": "DMI Editor",
 	"description": "DMI Editor Extension for Aseprite",
-	"version": "1.4.0",
+	"version": "1.4.1",
 	"contributors": [
 		{
 			"name": "Seefaaa",

package.json

@@ -16,8 +16,6 @@
 --- @field widgets (AnyWidget)[] A table containing all state widgets.
 --- @field selected_states State[] Selected icon widgets to possibly combine.
 --- @field context_widget ContextWidget|nil The state that is currently being right clicked
---- @field beforecommand number The event object for the "beforecommand" event.
---- @field aftercommand number The event object for the "aftercommand" event.
 --- @field dialog Dialog The dialog object.
 --- @field save_path string|nil The path of the file to be saved.
 --- @field open_path string|nil The path of the file to be opened.
@@ -68,10 +66,6 @@ function Editor.new(title, dmi)
 
 	self.image_cache      = ImageCache.new()
 
-	self.beforecommand    = app.events:on("beforecommand", function(ev) self:onbeforecommand(ev) end)
-
-	self.aftercommand     = app.events:on("aftercommand", function(ev) self:onaftercommand(ev) end)
-
 	self:new_dialog(title)
 	self:show()
 
@@ -215,24 +209,22 @@ function Editor:close(event, force)
 		libdmi.remove_dir(self.dmi.temp, false)
 	end
 
+	-- Close sprites first to release file locks, then remove temp directory
 	self:gc_open_sprites()
 	for _, state_sprite in ipairs(self.open_sprites) do
 		if state_sprite.sprite and Editor.is_sprite_open(state_sprite.sprite) then
 			state_sprite.sprite:close()
 		end
 	end
 
-	app.events:off(self.beforecommand)
-	app.events:off(self.aftercommand)
-
 	self.mouse = nil
 	self.focused_widget = nil
 	self.dialog = nil
 	self.widgets = nil
 	self.dmi = nil
 	self.open_sprites = nil
-	self.beforecommand = nil
-	self.aftercommand = nil
+	self.animation_timer = nil
+	self.animation_running = false
 
 	return true
 end

scripts/classes/editor/_editor.lua

@@ -51,6 +51,7 @@ function Preferences.show(plugin)
 		selected = Preferences.plugin.preferences.auto_flatten,
 	}
 
+
 	dialog:button {
 		text = "&OK",
 		focus = true,

scripts/classes/preferences.lua

@@ -39,20 +39,60 @@ function init(plugin)
 		if ev.name == "OpenFile" then
 			local opening_raw = RawDmi.opening
 			RawDmi.after_open(app.sprite)
-
+			-- Collect all .dmi placeholder sprites first, then close them, then create editors.
+			-- Calling Editor.new() -> app.events:on() inside an event callback can reallocate
+			-- Aseprite's internal callback vector while Events::call is iterating it (use-after-free).
+			local filenames = {}
 			if app.sprite and app.sprite.filename:ends_with(".dmi") and not opening_raw then
 				local filename = app.sprite.filename
 				app.command.CloseFile { ui = false }
 
+				-- Prevent duplicate editor instances for the same file
+				local normalized = string.lower(filename)
+				local found = false
+				for _, editor in ipairs(open_editors) do
+					if not editor.closed and string.lower(editor:path()) == normalized then
+						editor:repaint()
+						found = true
+						break
+					end
+				end
+
+				if not found then
+					table.insert(filenames, filename)
+				end
+			end
+
+			-- Now create editors outside the event callback
+			if #filenames > 0 then
 				loadlib(plugin.path)
-				Editor.new(DIALOG_NAME, filename)
+				for _, filename in ipairs(filenames) do
+					Editor.new(DIALOG_NAME, filename)
+				end
 			end
 		elseif ev.name == "Exit" then
 			exiting = true
 		end
+
+		-- Dispatch to open editors.  We do NOT register per-editor
+		-- listeners because calling app.events:on() from inside an
+		-- event callback can reallocate Aseprite's internal callback
+		-- vector while Events::call is iterating it (use-after-free).
+		for _, editor in ipairs(open_editors) do
+			if not editor.closed then
+				editor:onaftercommand(ev)
+			end
+		end
 	end)
 
 	before_listener = app.events:on("beforecommand", function(ev)
+		-- Dispatch to open editors first (same reason as aftercommand above).
+		for _, editor in ipairs(open_editors) do
+			if not editor.closed then
+				editor:onbeforecommand(ev)
+			end
+		end
+
 		if RawDmi.beforecommand(ev) then
 			return
 		elseif ev.name == "Exit" then