ContentCAO: Fix segfault on quit (attached)

minetest · Oct 9, 2019 · cbcb9e0 · cbcb9e0
1 parent b49dfa9
commit cbcb9e0
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/client/activeobjectmgr.cpp b/src/client/activeobjectmgr.cpp
@@ -29,7 +29,10 @@ void ActiveObjectMgr::clear()
 	// delete active objects
 	for (auto &active_object : m_active_objects) {
 		delete active_object.second;
+		// Object must be marked as gone when children try to detach
+		active_object.second = nullptr;
 	}
+	m_active_objects.clear();
 }
 
 void ActiveObjectMgr::step(