X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getoturepcommand.cpp;h=1d26b47b39c3ee998fb018bad12fb4e904b1e333;hb=b8a1ac74d3d4f9cd53f2a98cc6ea95f50860044b;hp=9f4dd54491bab042ae243998de20559b03285dfb;hpb=90708fe9701e3827e477c82fb3652539c3bf2a0d;p=mothur.git diff --git a/getoturepcommand.cpp b/getoturepcommand.cpp index 9f4dd54..1d26b47 100644 --- a/getoturepcommand.cpp +++ b/getoturepcommand.cpp @@ -574,6 +574,8 @@ int GetOTURepCommand::readDist() { readMatrix->read(nameMap); }else if (countfile != "") { readMatrix->read(&ct); + }else { + readMatrix->read(nameMap); } if (m->control_pressed) { delete readMatrix; return 0; } @@ -614,9 +616,11 @@ int GetOTURepCommand::readDist() { if(namefile != ""){ nameMap = new NameAssignment(namefile); nameMap->readMap(); - readMatrix->read(nameMap); + formatMatrix->read(nameMap); }else if (countfile != "") { - readMatrix->read(&ct); + formatMatrix->read(&ct); + }else { + formatMatrix->read(nameMap); } if (m->control_pressed) { delete formatMatrix; return 0; }