[Hgengine-cvs] SF.net SVN: hgengine:[581] Mercury2/src/ModuleManager.cpp

[<cn...@us...>]

Revision: 581
          http://hgengine.svn.sourceforge.net/hgengine/?rev=581&view=rev
Author:   cnlohr
Date:     2009-10-25 20:37:45 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
oops -- forgot to check for unregistered objects

Modified Paths:
--------------
    Mercury2/src/ModuleManager.cpp

Modified: Mercury2/src/ModuleManager.cpp
===================================================================
--- Mercury2/src/ModuleManager.cpp	2009-10-25 20:28:46 UTC (rev 580)
+++ Mercury2/src/ModuleManager.cpp	2009-10-25 20:37:45 UTC (rev 581)
@@ -139,7 +139,13 @@
 
 void ModuleManager::UnregisterInstance( void * instance )
 {
-	const char * sClass = m_pAllInstanceTypes[instance];
+	std::map< void *, const char * >::iterator ni = m_pAllInstanceTypes.find( instance );
+
+	//Object was never registered.
+	if( ni == m_pAllInstanceTypes.end() )
+		return;
+
+	const char * sClass = ni->second;
 	std::set< void * > & s = m_hAllInstances[sClass];
 	std::set< void * >::iterator i = s.find( instance );
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.