fixed some bugs

[mothur.git] / collectcommand.cpp

diff --git a/collectcommand.cpp b/collectcommand.cpp
index 2dd843f68f83d2eeec882253b8e50cda1ee9236b..c65080fd32022bcd9abb8d3cf10f73de8f181351 100644 (file)
--- a/collectcommand.cpp
+++ b/collectcommand.cpp
@@ -195,11 +195,13 @@ void CollectCommand::help(){
 //**********************************************************************************************************************
 
 CollectCommand::~CollectCommand(){
-       delete order;
-       delete input;
-       delete cCurve;
-       delete read;
-       delete validCalculator;
+       if (abort == false) {
+               //delete order;
+               delete input;  globaldata->ginput = NULL;
+               delete read;
+               delete validCalculator;
+               globaldata->gorder = NULL;
+       }
 }
 
 //**********************************************************************************************************************
@@ -252,7 +254,7 @@ int CollectCommand::execute(){
                                userLabels.erase(lastOrder->getLabel());
                        }
                        
-                       if (count != 1) { delete lastOrder; }
+                       if (count != 1) { delete lastOrder;  }
                        lastOrder = order;                      
                        order = (input->getOrderVector());
                        count++;