ContentCAO: Fix segfault on quit (attached)

2019-10-09 19:54:15 +02:00 · 2019-10-09 19:54:15 +02:00 · cbcb9e0b1c
parent b49dfa92ce
commit cbcb9e0b1c
1 changed files with 3 additions and 0 deletions
--- 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(