From 12771edb0eb2904443edde17c7d914e0cbc01ae5 Mon Sep 17 00:00:00 2001
From: leper <leper@wildfiregames.com>
Date: Sat, 16 Aug 2014 01:23:50 +0000
Subject: [PATCH] Delete dynamic message subscriptions on simulation reset.

This was SVN commit r15646.
---
 source/simulation2/system/ComponentManager.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/simulation2/system/ComponentManager.cpp b/source/simulation2/system/ComponentManager.cpp
index eca5c0b659..aa9d2f0ed2 100644
--- a/source/simulation2/system/ComponentManager.cpp
+++ b/source/simulation2/system/ComponentManager.cpp
@@ -500,6 +500,10 @@ void CComponentManager::Script_DestroyEntity(ScriptInterface::CxPrivate* pCxPriv
 
 void CComponentManager::ResetState()
 {
+	// Delete all dynamic message subscriptions
+	m_DynamicMessageSubscriptionsNonsync.clear();
+	m_DynamicMessageSubscriptionsNonsyncByComponent.clear();
+
 	// Delete all IComponents
 	std::map<ComponentTypeId, std::map<entity_id_t, IComponent*> >::iterator iit = m_ComponentsByTypeId.begin();
 	for (; iit != m_ComponentsByTypeId.end(); ++iit)