src/hg/hgTracks/hgTracks.c 1.1557

Index: src/hg/hgTracks/hgTracks.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/hgTracks/hgTracks.c,v
retrieving revision 1.1556
retrieving revision 1.1557
diff -b -B -U 4 -r1.1556 -r1.1557
--- src/hg/hgTracks/hgTracks.c	27 Feb 2009 18:47:52 -0000	1.1556
+++ src/hg/hgTracks/hgTracks.c	3 Mar 2009 19:38:52 -0000	1.1557
@@ -195,21 +195,26 @@
             struct trackDb *tdb = track->tdb;
 	    if (changeVis == -1)
                 {
                 /* restore defaults */
-                if (tdbIsSuperTrackChild(tdb))
+                if (tdbIsSuperTrackChild(tdb) || tdbIsCompositeChild(tdb))
                     {
+                    //if(tdb->parentName == NULL || differentString(tdb->parentName,tdb->parent->tableName))
+                    //    tdb->parentName = tdb->parent->tableName;
                     /* removing the supertrack parent's cart variables
                      * restores defaults */
-                    assert(tdb->parentName != NULL);
-                    cartRemove(cart, tdb->parentName);
+                    //assert(tdb->parentName != NULL);
+                    //cartRemove(cart, tdb->parentName);
+                    assert(tdb->parent != NULL && tdb->parent->tableName);
+                    cartRemove(cart, tdb->parent->tableName);
                     if (withPriorityOverride)
                         {
-                        safef(pname, sizeof(pname), "%s.priority",
-                                    tdb->parentName);
+                        //safef(pname, sizeof(pname), "%s.priority",tdb->parentName);
+                        safef(pname, sizeof(pname), "%s.priority",tdb->parent->tableName);
                         cartRemove(cart, pname);
                         }
                     }
+
                 track->visibility = tdb->visibility;
                 cartRemove(cart, track->mapName);
 
                 /* set the track priority back to the default value */