From 18e4183623799bd3fd12c02987bd8061020956fa Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 23 May 2024 20:54:45 -0500 Subject: [PATCH] [jasper/world/studio] Simplify EditWorldSizeCommand::mergeWith --- .../modules/world/src/studio/worldeditor/commands/editsize.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/jasper/modules/world/src/studio/worldeditor/commands/editsize.cpp b/src/jasper/modules/world/src/studio/worldeditor/commands/editsize.cpp index 2131acf..0a8d1d1 100644 --- a/src/jasper/modules/world/src/studio/worldeditor/commands/editsize.cpp +++ b/src/jasper/modules/world/src/studio/worldeditor/commands/editsize.cpp @@ -38,9 +38,8 @@ bool EditWorldSizeCommand::mergeWith(studio::UndoCommand const&cmd) noexcept { m_newSize = es->m_newSize; // undo resize(m_doc, m_oldSize); - m_doc.tiles = std::move(m_oldMap); + m_doc.tiles = m_oldMap; // redo - m_oldMap = m_doc.tiles; resize(m_doc, m_newSize); oxLogError(loadWorldStatic(m_objCache, m_doc).moveTo(m_worldStatic)); return true;