0d7d8b05ae8feaff74cdcf75eb4ef5fe488264d1 tdreszer Tue Aug 9 16:24:40 2011 -0700 Fix for rightClick chnage of vis when track is from dataHub (redmine 4881) diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index 3d6450f..37da073 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -4145,34 +4145,37 @@ if (userSeqString != NULL) slSafeAddHead(&trackList, userPslTg()); slSafeAddHead(&trackList, oligoMatchTg()); if (restrictionEnzymesOk()) { slSafeAddHead(&trackList, cuttersTg()); } if (wikiTrackEnabled(database, NULL)) { addWikiTrack(&trackList); struct sqlConnection *conn = wikiConnect(); if (sqlTableExists(conn, "variome")) addVariomeWikiTrack(&trackList); wikiDisconnect(&conn); } +if (cartOptionalString(cart, "hgt.trackNameFilter") == NULL) + { // If a single track was asked for and it is from a hub, then it is already in trackList loadTrackHubs(&trackList, &hubList); slReverse(&hubList); -loadCustomTracks(&trackList); groupTracks(hubList, &trackList, pGroupList, vis); + } +loadCustomTracks(&trackList); setSearchedTrackToPackOrFull(trackList); if (cgiOptionalString( "hideTracks")) changeTrackVis(groupList, NULL, tvHide); /* Get visibility values if any from ui. */ for (track = trackList; track != NULL; track = track->next) { char *s = cartOptionalString(cart, track->track); if (cgiOptionalString("hideTracks")) { s = cgiOptionalString(track->track); if (s != NULL && (hTvFromString(s) != track->tdb->visibility)) { cartSetString(cart, track->track, s); }