0440cfd6ef79932ae3d3d1934d9665b2848e8952 kate Mon Oct 7 14:54:50 2019 -0700 Add filter activated notice to bigNarrowPeak. refs #24271 diff --git src/hg/lib/hui.c src/hg/lib/hui.c index 3259052..74bb8a8 100644 --- src/hg/lib/hui.c +++ src/hg/lib/hui.c @@ -5051,36 +5051,39 @@ if (wordCount == 1) return TRUE; if (wordCount != 3) { warn("Track %s %s setting invalid: %s", tdb->track, SUBTRACK_HIDE_EMPTY, orig); return FALSE; } // multi-bed specified (to speed display) if (retMultiBedFile) *retMultiBedFile = cloneString(hReplaceGbdb(words[1])); if (retSubtrackIdFile) *retSubtrackIdFile = cloneString(hReplaceGbdb(words[2])); return TRUE; } -boolean compositeHideEmptySubtracks(struct cart *cart, struct trackDb *tdb, +boolean compositeHideEmptySubtracks(struct cart *cart, struct trackDb *childTdb, char **retMutiBedFile, char **retSubtrackIdFile) /* Parse hideEmptySubtracks setting and check cart * Return TRUE if we should hide empties */ { +struct trackDb *tdb = tdbGetComposite(childTdb); +if (!parentTdb) + return FALSE; boolean deflt = FALSE; if (!compositeHideEmptySubtracksSetting(tdb, &deflt, retMutiBedFile, retSubtrackIdFile)) return FALSE; char buf[128]; safef(buf, sizeof buf, "%s.%s", tdb->track, SUBTRACK_HIDE_EMPTY); return cartUsualBoolean(cart, buf, deflt); } static void compositeUiSubtracks(char *db, struct cart *cart, struct trackDb *parentTdb) // Display list of subtracks and descriptions with checkboxes to control visibility and // possibly other nice things including links to schema and metadata and a release date. { char buffer[SMALLBUF]; struct trackDb *subtrack;