From a91e557c68845fdfa66801a4976f1c4c91bed040 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Sun, 14 Jan 2024 22:10:18 +0400
Subject: [PATCH] Fix Touch command (bug 7765)

---
 CHANGELOG.md                         | 1 +
 apps/opencs/model/world/commands.cpp | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75e6f05dd2..e0dbe3960a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -128,6 +128,7 @@
     Bug #7742: Governing attribute training limit should use the modified attribute
     Bug #7758: Water walking is not taken into account to compute path cost on the water
     Bug #7761: Rain and ambient loop sounds are mutually exclusive
+    Bug #7765: OpenMW-CS: Touch Record option is broken
     Bug #7770: Sword of the Perithia: Script execution failure
     Feature #2566: Handle NAM9 records for manual cell references
     Feature #3537: Shader-based water ripples
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index da49caef10..b2ad84966f 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -36,7 +36,7 @@ CSMWorld::TouchCommand::TouchCommand(IdTable& table, const std::string& id, QUnd
 
 void CSMWorld::TouchCommand::redo()
 {
-    mOld.reset(mTable.getRecord(mId).clone().get());
+    mOld = mTable.getRecord(mId).clone();
     mChanged = mTable.touchRecord(mId);
 }
 
@@ -181,9 +181,8 @@ const std::string& CSMWorld::TouchLandCommand::getDestinationId() const
 
 void CSMWorld::TouchLandCommand::onRedo()
 {
+    mOld = mLands.getRecord(mId).clone();
     mChanged = mLands.touchRecord(mId);
-    if (mChanged)
-        mOld.reset(mLands.getRecord(mId).clone().get());
 }
 
 void CSMWorld::TouchLandCommand::onUndo()