From e4d547316dd6eba01ff0d35cbcd99f522a407099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?=
 <jerome.leclercq@fullcycle.games>
Date: Thu, 16 Aug 2018 18:06:02 +0200
Subject: [PATCH] Core/ObjectHandle: Fix Reset(ObjectHandle&&) not clearing the
 pointer

---
 ChangeLog.md                         | 1 +
 include/Nazara/Core/ObjectHandle.inl | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index da3410fb7..60735f783 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -134,6 +134,7 @@ Nazara Engine:
 - Added Unicode Data downloader/parser
 - Integrated Unicode Data
 - Added CullingList::FillWithAllEntries method
+- Fixed ObjectHandle movement sometimes not resetting its internal pointer
 
 Nazara Development Kit:
 - Added ImageWidget (#139)
diff --git a/include/Nazara/Core/ObjectHandle.inl b/include/Nazara/Core/ObjectHandle.inl
index f415f93de..0ba6afc2c 100644
--- a/include/Nazara/Core/ObjectHandle.inl
+++ b/include/Nazara/Core/ObjectHandle.inl
@@ -140,6 +140,8 @@ namespace Nz
 			handle.m_object = nullptr;
 			object->UpdateHandle(&handle, this);
 		}
+		else
+			m_object = nullptr;
 	}
 
 	/*!