some changes while testing 1.9

[mothur.git] / getsabundcommand.cpp

diff --git a/getsabundcommand.cpp b/getsabundcommand.cpp
index 9260a5c0fea40ce63bf77ed4f20a12f437b9a08a..ca8c8a66a9445c21a7472301dce1bce71abe34b3 100644 (file)
--- a/getsabundcommand.cpp
+++ b/getsabundcommand.cpp
@@ -115,7 +115,7 @@ int GetSAbundCommand::execute(){
                set<string> processedLabels;
                set<string> userLabels = labels;
                
-               if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL;  return 0; }
+               if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete order; globaldata->gorder = NULL;  return 0; }
 
                
                while((order != NULL) && ((allLines == 1) || (userLabels.size() != 0))) {
@@ -127,7 +127,7 @@ int GetSAbundCommand::execute(){
                                        sabund->print(out);
                                        delete sabund;
                                        
-                                       if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL;  return 0; }
+                                       if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete order; globaldata->gorder = NULL;  return 0; }
 
                                        processedLabels.insert(order->getLabel());
                                        userLabels.erase(order->getLabel());
@@ -145,7 +145,7 @@ int GetSAbundCommand::execute(){
                                        sabund->print(out);
                                        delete sabund;
                                        
-                                       if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL;  return 0; }
+                                       if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete order; globaldata->gorder = NULL;  return 0; }
 
                                        processedLabels.insert(order->getLabel());
                                        userLabels.erase(order->getLabel());
@@ -185,12 +185,11 @@ int GetSAbundCommand::execute(){
                        sabund->print(out);
                        delete sabund;
                        
-                       if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete order; globaldata->gorder = NULL;  return 0; }
+                       if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete order; globaldata->gorder = NULL;  return 0; }
                        
                        delete order;
                }
                globaldata->gorder = NULL;
-               delete read; delete input;
 
                out.close();