X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getrabundcommand.cpp;h=b665c88cdede4273b1aadd5bf1d4ee21ddec6b85;hb=8f7164a88df624fd0a8d1eddbb3d744463cc9ecb;hp=6b68c32cad7673b950eeb8acfe6423b160630130;hpb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3;p=mothur.git

diff --git a/getrabundcommand.cpp b/getrabundcommand.cpp
index 6b68c32..b665c88 100644
--- a/getrabundcommand.cpp
+++ b/getrabundcommand.cpp
@@ -120,7 +120,7 @@ int GetRAbundCommand::execute(){
 		set<string> processedLabels;
 		set<string> userLabels = labels;
 		
-		if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete list; globaldata->gListVector = NULL;  return 0; }
+		if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete list; globaldata->gListVector = NULL;  return 0; }
 		
 		while((list != NULL) && ((allLines == 1) || (userLabels.size() != 0))) {
 			
@@ -129,7 +129,7 @@ int GetRAbundCommand::execute(){
 					rabund = new RAbundVector();				
 					*rabund = (list->getRAbundVector());
 					
-					if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete list; delete rabund; globaldata->gListVector = NULL;  return 0; }
+					if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete list; delete rabund; globaldata->gListVector = NULL;  return 0; }
 
 					
 					if(sorted)	{   rabund->print(out);				}
@@ -151,7 +151,7 @@ int GetRAbundCommand::execute(){
 					rabund = new RAbundVector();
 					*rabund = (list->getRAbundVector());
 					
-					if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete list; delete rabund; globaldata->gListVector = NULL;  return 0; }
+					if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete list; delete rabund; globaldata->gListVector = NULL;  return 0; }
 					
 					if(sorted)	{   rabund->print(out);				}
 					else		{	rabund->nonSortedPrint(out);	}
@@ -193,7 +193,7 @@ int GetRAbundCommand::execute(){
 			rabund = new RAbundVector();
 			*rabund = (list->getRAbundVector());
 			
-			if (m->control_pressed) {  out.close(); remove(filename.c_str()); delete read; delete input; delete list; delete rabund; globaldata->gListVector = NULL;  return 0; }
+			if (m->control_pressed) {  out.close(); remove(filename.c_str());  delete list; delete rabund; globaldata->gListVector = NULL;  return 0; }
 			
 			if(sorted)	{   rabund->print(out);				}
 			else		{	rabund->nonSortedPrint(out);	}
@@ -206,11 +206,10 @@ int GetRAbundCommand::execute(){
 		m->mothurOut("Output File Name: "); m->mothurOutEndLine();
 		m->mothurOut(filename); m->mothurOutEndLine();	
 		m->mothurOutEndLine();
-
 		
 		out.close(); 
-		delete read; delete input;
-		globaldata->gListVector = NULL; 
+		
+		globaldata->gListVector = NULL;
 		
 		return 0;		
 	}