== BUGFIX ==

- fix crash when exiting game engine (with ESC-key).
- reason for crash: std::vector iterator is invalid after vector::erase

1 files changed, 2 insertions, 2 deletions

diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp
index bbe5a51db3c..8f156cc63e7 100644
--- a/source/gameengine/GameLogic/SCA_IController.cpp
+++ b/source/gameengine/GameLogic/SCA_IController.cpp
@@ -133,11 +133,11 @@ void	SCA_IController::UnlinkActuator(class SCA_IActuator* actua)
 	}
 	if (!(actit==m_linkedactuators.end()))
 	{
-		m_linkedactuators.erase(actit);
 		if (IsActive())
 		{
 			(*actit)->DecLink();
 		}
+		m_linkedactuators.erase(actit);
 	}
 }
 
@@ -163,11 +163,11 @@ void SCA_IController::UnlinkSensor(class SCA_ISensor* sensor)
 	}
 	if (!(sensit==m_linkedsensors.end()))
 	{
-		m_linkedsensors.erase(sensit);
 		if (IsActive())
 		{
 			(*sensit)->DecLink();
 		}
+		m_linkedsensors.erase(sensit);
 	}
 }