8523f0b59275db50e5f84bceb61040431ea57155 angie Tue Apr 28 13:28:17 2020 -0700 Applying Braney's fix for vcfTabixLoadItems in 0de7cb7d to vcfLoadItems for consistency. refs #25462 diff --git src/hg/hgTracks/vcfTrack.c src/hg/hgTracks/vcfTrack.c index ee4045c..7adba22 100644 --- src/hg/hgTracks/vcfTrack.c +++ src/hg/hgTracks/vcfTrack.c @@ -1652,32 +1652,33 @@ else { conn = hAllocConn(CUSTOM_TRASH); table = ct->dbTableName; } char *vcfFile = bbiNameFromSettingOrTable(tg->tdb, conn, table); hFreeConn(&conn); /* protect against parse error */ struct errCatch *errCatch = errCatchNew(); if (errCatchStart(errCatch)) { vcff = vcfFileMayOpen(vcfFile, chromName, winStart, winEnd, vcfMaxErr, -1, TRUE); if (vcff != NULL) { filterRecords(vcff, tg->tdb); + int vis = tdbVisLimitedByAncestors(cart,tg->tdb,TRUE,TRUE); if (hapClustEnabled && vcff->genotypeCount > 1 && vcff->genotypeCount < 3000 && - (tg->visibility == tvPack || tg->visibility == tvSquish)) + (vis == tvPack || vis == tvSquish)) vcfHapClusterOverloadMethods(tg, vcff); else { tg->items = vcfFileToPgSnp(vcff, tg->tdb); // pgSnp bases coloring/display decision on count of items: tg->customInt = slCount(tg->items); } // Don't vcfFileFree here -- we are using its string pointers! } else errAbort("Unable to open VCF file '%s'", vcfFile); } errCatchEnd(errCatch); if (errCatch->gotError || vcff == NULL) {