X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=venncommand.cpp;h=5cc0fea3affdfa6d021ff93bef964f478400f5bc;hp=7601ed8e667b10e2b2cd6eaf48c8f5ce365cc6f0;hb=c69e2e9749626cfbf1d6cb0125ae94f869e00b18;hpb=c887ae6cd9f1c5b6e1b73a1384f154392be4efa3

diff --git a/venncommand.cpp b/venncommand.cpp
index 7601ed8..5cc0fea 100644
--- a/venncommand.cpp
+++ b/venncommand.cpp
@@ -33,8 +33,7 @@ vector<string> VennCommand::getValidParameters(){
 //**********************************************************************************************************************
 VennCommand::VennCommand(){	
 	try {
-		abort = true;
-		//initialize outputTypes
+		abort = true; calledHelp = true; 
 		vector<string> tempOutNames;
 		outputTypes["svg"] = tempOutNames;
 	}
@@ -71,12 +70,12 @@ vector<string> VennCommand::getRequiredFiles(){
 VennCommand::VennCommand(string option)  {
 	try {
 		globaldata = GlobalData::getInstance();
-		abort = false;
+		abort = false; calledHelp = false;   
 		allLines = 1;
 		labels.clear();
 			
 		//allow user to run help
-		if(option == "help") { help(); abort = true; }
+		if(option == "help") { help(); abort = true; calledHelp = true; }
 		
 		else {
 			//valid paramters for this command
@@ -243,7 +242,7 @@ VennCommand::~VennCommand(){
 int VennCommand::execute(){
 	try {
 	
-		if (abort == true) { return 0; }
+		if (abort == true) { if (calledHelp) { return 0; }  return 2;	}
 		
 		string lastLabel;