Merge branch 'touch_record' into 'master'

Fix Touch command

See merge request OpenMW/openmw!3778

CHANGELOG.md

@@ -129,6 +129,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

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()