From 63e74b4f476d76a8a2fc8f306176b024c1a7bffe Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 7 Jul 2022 08:50:44 +0200 Subject: [PATCH] Physics2D/RigidBody2D: Fix crash when moving an already moved value --- src/Nazara/Physics2D/RigidBody2D.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Nazara/Physics2D/RigidBody2D.cpp b/src/Nazara/Physics2D/RigidBody2D.cpp index 419d79656..bfb04b6f0 100644 --- a/src/Nazara/Physics2D/RigidBody2D.cpp +++ b/src/Nazara/Physics2D/RigidBody2D.cpp @@ -609,9 +609,12 @@ namespace Nz m_velocityFunc = std::move(object.m_velocityFunc); m_world = object.m_world; - cpBodySetUserData(m_handle, this); - for (cpShape* shape : m_shapes) - cpShapeSetUserData(shape, this); + if (m_handle) + { + cpBodySetUserData(m_handle, this); + for (cpShape* shape : m_shapes) + cpShapeSetUserData(shape, this); + } object.m_handle = nullptr;