From c9d3453e46a02b75348dde5a7c567b5effc25b44 Mon Sep 17 00:00:00 2001
From: xkef <kevinkkueng@gmail.com>
Date: Sun, 13 Aug 2023 21:47:43 +0200
Subject: [PATCH] Fix undo not immediately removing copy/pasted layer (#1381)

Bugfix: Undo does not work when copy/pasting layers (or groups), it should remove the layer that was pasted
---
 .../messages/portfolio/portfolio_message_handler.rs  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs
index b2623d01..18ca9d52 100644
--- a/editor/src/messages/portfolio/portfolio_message_handler.rs
+++ b/editor/src/messages/portfolio/portfolio_message_handler.rs
@@ -393,17 +393,17 @@ impl MessageHandler<PortfolioMessage, (&InputPreprocessorMessageHandler, &Prefer
 						for entry in data.iter().rev() {
 							let destination_path = [shallowest_common_folder.to_vec(), vec![generate_uuid()]].concat();
 
-							responses.add_front(DocumentMessage::UpdateLayerMetadata {
-								layer_path: destination_path.clone(),
-								layer_metadata: entry.layer_metadata,
-							});
 							document.load_layer_resources(responses, &entry.layer.data, destination_path.clone(), self.active_document_id.unwrap());
-							responses.add_front(DocumentOperation::InsertLayer {
+							responses.add(DocumentOperation::InsertLayer {
 								layer: Box::new(entry.layer.clone()),
-								destination_path,
+								destination_path: destination_path.clone(),
 								insert_index: -1,
 								duplicating: false,
 							});
+							responses.add(DocumentMessage::UpdateLayerMetadata {
+								layer_path: destination_path,
+								layer_metadata: entry.layer_metadata,
+							});
 						}
 
 						responses.add(DocumentMessage::CommitTransaction);