From 4ab6f2a9855b8269367082e84b5437a42cf84890 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Mon, 23 Nov 2015 17:25:35 +0100
Subject: [PATCH] Fix crash in ConfigItem::ActivateItems

refs #10643
---
 lib/config/configitem.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 9e172d817..51d1301eb 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -313,8 +313,10 @@ void ConfigItem::Register(void)
  */
 void ConfigItem::Unregister(void)
 {
-	if (m_Object)
+	if (m_Object) {
 		m_Object->Unregister();
+		m_Object.reset();
+	}
 
 	boost::mutex::scoped_lock lock(m_Mutex);
 	m_UnnamedItems.erase(std::remove(m_UnnamedItems.begin(), m_UnnamedItems.end(), this), m_UnnamedItems.end());
-- 
2.40.0