--- trunk/src/brains/SimInfo.cpp	2005/02/13 20:36:24	328
+++ trunk/src/brains/SimInfo.cpp	2005/03/07 22:39:33	398
@@ -144,10 +144,14 @@ SimInfo::~SimInfo() {
 }
 
 SimInfo::~SimInfo() {
-    //MemoryUtils::deleteVectorOfPointer(molecules_);
-
-    MemoryUtils::deleteVectorOfPointer(moleculeStamps_);
+    std::map<int, Molecule*>::iterator i;
+    for (i = molecules_.begin(); i != molecules_.end(); ++i) {
+        delete i->second;
+    }
+    molecules_.clear();
     
+    MemoryUtils::deletePointers(moleculeStamps_);
+    
     delete sman_;
     delete simParams_;
     delete forceField_;
@@ -835,6 +839,11 @@ void SimInfo::setSnapshotManager(SnapshotManager* sman
 }
 
 void SimInfo::setSnapshotManager(SnapshotManager* sman) {
+    //if (sman_ == sman_) {
+    //    return;
+    //}
+    
+    //delete sman_;
     sman_ = sman;
 
     Molecule* mol;