Merge branch 'latest' of https://github.com/Cibiv/IQ-TREE into latest

bqminh · bqminh · commit b8c0785f697f · 2019-10-22T09:43:49.000+11:00
diff --git a/tree/phylotree.cpp b/tree/phylotree.cpp
@@ -280,7 +280,7 @@ void PhyloTree::readTree(const char *infile, bool &is_rooted) {
     MTree::readTree(infile, is_rooted);
     // 2015-10-14: has to reset this pointer when read in
     current_it = current_it_back = NULL;
-    if (rooted)
+    if (rooted && root)
         computeBranchDirection();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ void PhyloTree::readTree(const char *infile, bool &is_rooted) {`
`280`	`280`	`MTree::readTree(infile, is_rooted);`
`281`	`281`	`// 2015-10-14: has to reset this pointer when read in`
`282`	`282`	`current_it = current_it_back = NULL;`
`283`		`- if (rooted)`
	`283`	`+ if (rooted && root)`
`284`	`284`	`computeBranchDirection();`
`285`	`285`	`}`
`286`	`286`