X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=consensus.cpp;h=d45a395604148c398f0f7c5a3d379476e3bdda97;hp=04671f87913b1fad40f060654942cdaae8d5ff89;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=82723a54e6109e2d46d84c10e87727cebd5a18ea

diff --git a/consensus.cpp b/consensus.cpp
index 04671f8..d45a395 100644
--- a/consensus.cpp
+++ b/consensus.cpp
@@ -10,7 +10,7 @@
 #include "consensus.h"
 
 //**********************************************************************************************************************
-Tree* Consensus::getTree(vector<Tree*>& t, TreeMap* tmap){
+Tree* Consensus::getTree(vector<Tree*>& t){
 	try {
 		numNodes = t[0]->getNumNodes();
 		numLeaves = t[0]->getNumLeaves();
@@ -21,7 +21,7 @@ Tree* Consensus::getTree(vector<Tree*>& t, TreeMap* tmap){
 		
 		if (m->control_pressed) { return 0; }
 		
-		consensusTree = new Tree(tmap);
+		consensusTree = new Tree(t[0]->getCountTable());
 		
 		it2 = nodePairs.find(treeSet);
 		
@@ -35,11 +35,11 @@ Tree* Consensus::getTree(vector<Tree*>& t, TreeMap* tmap){
 		
 		buildConsensusTree(treeSet);
 		
-		if (m->control_pressed) { delete consensusTree; return 0; }
+		if (m->control_pressed) {  delete consensusTree; return 0; }
 		
 		consensusTree->assembleTree();
 		
-		if (m->control_pressed) { delete consensusTree; return 0; }
+		if (m->control_pressed) {  delete consensusTree; return 0; }
 				
 		return consensusTree;