2bef4507d310c57d5462683dec8ad46b11f2a7e7
kate
  Tue Mar 3 15:16:55 2020 -0800
Minor tweaks to compositeHideEmptySubtracks (new syntax). refs #23365

diff --git src/hg/lib/hui.c src/hg/lib/hui.c
index fd26e51..91db129 100644
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@ -5228,39 +5228,40 @@
  *          hideEmptySubtracksMultiBedUrl multiBed.bigBed 
  *          hideEmptySubtracksSourceUrl subtrackIds.tab
  * MultiBed.bed is a bed3Sources bigBed, generated with UCSC tool trackDbIndexBb
  *              (for single view subtracks, can use bedtools multiinter
  *              post-processed by UCSC multiBed.pl tool)
  *      subtrackIds.tab is a tab-sep file: id subtrackName
  *
  * Return TRUE if setting is present.  retDefault is TRUE if set to 'on', o/w FALSE
  */
 {
 if (!tdbIsComposite(tdb))
     return FALSE;
 char *hideEmpties = cloneString(trackDbSetting(tdb, SUBTRACK_HIDE_EMPTY));
 if (!hideEmpties)
     return FALSE;
+boolean deflt = FALSE;
 if (sameString(hideEmpties, "on"))
-    *retDefault = TRUE;
-else if (sameString(hideEmpties, "off"))
-    *retDefault = FALSE;
-else
+    deflt = TRUE;
+else if (differentString(hideEmpties, "off"))
     {
     warn("Track %s %s setting invalid: %s", tdb->track, SUBTRACK_HIDE_EMPTY, hideEmpties);
     return FALSE;
     }
+if (retDefault)
+    *retDefault = deflt;
 if (retMultiBedFile != NULL && retSubtrackIdFile != NULL)
     {
     char *file = cloneString(trackDbSetting(tdb, SUBTRACK_HIDE_EMPTY_MULTIBED_URL));
     if (file != NULL)
         {
         // multi-bed specified to speed display
         *retMultiBedFile = cloneString(hReplaceGbdb(file));
         file = cloneString(trackDbSetting(tdb, SUBTRACK_HIDE_EMPTY_SOURCES_URL));
         if (file == NULL)
             {
             warn("Track %s missing setting: %s", tdb->track, SUBTRACK_HIDE_EMPTY_SOURCES_URL);
             return FALSE;
             }
         *retSubtrackIdFile = cloneString(hReplaceGbdb(file));
         }