src/hg/hgTracks/simpleTracks.c 1.97

1.97 2009/08/25 21:28:40 braney
a fix to prevent loading of composite subTracks that are set to on in the trackDb but are hidden by the view settings.
Index: src/hg/hgTracks/simpleTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/simpleTracks.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -b -B -U 4 -r1.96 -r1.97
--- src/hg/hgTracks/simpleTracks.c	14 Aug 2009 07:18:53 -0000	1.96
+++ src/hg/hgTracks/simpleTracks.c	25 Aug 2009 21:28:40 -0000	1.97
@@ -10669,10 +10669,12 @@
 struct track *subtrack;
 long thisTime = 0, lastTime = 0;
 for (subtrack = track->subtracks; subtrack != NULL; subtrack = subtrack->next)
     {
-    if (isSubtrackVisible(subtrack))
+    if (isSubtrackVisible(subtrack) && 
+	( limitedVisFromComposite(subtrack) != tvHide))
 	{
+
 	lastTime = clock1000();
 	if (!subtrack->loadItems) // This could happen if track type has no handler (eg, for new types)
 	    errAbort("Error: No loadItems() handler for subtrack (%s) of composite track (%s) (is this a new track 'type'?)\n", subtrack->mapName, track->mapName);
         subtrack->loadItems(subtrack);