From d1c0cfa5248f6be8a3e905f0ad52cb3889f14eab Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 12 Jul 2021 14:11:14 +0000
Subject: [PATCH] Merge branch 'lifetime' into 'master'

Maybe fix #6071

Closes #6071

See merge request OpenMW/openmw!1010

(cherry picked from commit 64750820957773a00d449d29551bb15fbf5fe08b)

1650dabe Assign the return value of weak_ptr::lock() to a variable, so that the
---
 apps/openmw/mwphysics/mtphysics.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwphysics/mtphysics.cpp b/apps/openmw/mwphysics/mtphysics.cpp
index 9b98e7e8f7..29d1e0b7c1 100644
--- a/apps/openmw/mwphysics/mtphysics.cpp
+++ b/apps/openmw/mwphysics/mtphysics.cpp
@@ -599,7 +599,7 @@ namespace MWPhysics
         if (!mRemainingSteps)
             return;
         for (auto& data : mActorsFrameData)
-            if (data.mActor.lock())
+            if (const auto actor = data.mActor.lock())
             {
                 std::unique_lock lock(mCollisionWorldMutex);
                 MovementSolver::unstuck(data, mCollisionWorld);