Fixes uchime windows multiple processors bug

mothur · 167b18f1aa5e505271bddf12e74ef8ca0ae9d5c1 · mothur-westcott committed Sep 7, 2016 · Sep 7, 2016 · 167b18f
1 parent 3330ad9
commit 167b18f1aa5e505271bddf12e74ef8ca0ae9d5c1
Unified Split

Showing with 3 additions and 3 deletions.

+1 −1 source/commands/chimerauchimecommand.cpp

+2 −2 source/commands/chimerauchimecommand.h
diff --git a/source/commands/chimerauchimecommand.cpp b/source/commands/chimerauchimecommand.cpp
@@ -1801,7 +1801,7 @@ int ChimeraUchimeCommand::createProcessesGroups(string outputFName, string filen
             }
 
 		}
-		m->mothurOut(toString( getpid() ) + " here\n");
+		//m->mothurOut(toString( getpid() ) + " here\n");
             
 		//do my part
 		num = driverGroups(outputFName, filename, accnos, alns, accnos + ".byCount", lines[0].start, lines[0].end, groups);
diff --git a/source/commands/chimerauchimecommand.h b/source/commands/chimerauchimecommand.h
@@ -185,7 +185,6 @@ static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
 		for (int i = pDataArray->start; i < pDataArray->end; i++) {
 			int start = time(NULL);	 if (pDataArray->m->control_pressed) {  if (pDataArray->hasCount) { delete cparser; } { delete parser; } return 0; }
 			
-            
 			int error;
             if (pDataArray->hasCount) { 
                 error = cparser->getSeqs(pDataArray->groups[i], pDataArray->filename, "/ab=", "/", true); if ((error == 1) || pDataArray->m->control_pressed) {  delete cparser; return 0; }
@@ -519,7 +518,8 @@ static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
 		
         if (pDataArray->hasCount && pDataArray->dups) { outCountList.close(); }
 		pDataArray->count = totalSeqs;
-		if (pDataArray->hasCount) { delete cparser; } { delete parser; }
+		if (pDataArray->hasCount) { delete cparser; }
+        else { delete parser; }
 		return totalSeqs;
 		
 	}