db2405f972ffdd9a183d1b1708c4aaf6fb6804bf
tdreszer
  Tue Aug 10 16:39:16 2010 -0700
Fixed bug when SUBTRACKS_HAVE_VIS was on and wigMafs triggered infinite loop
diff --git src/hg/hgTracks/imageV2.h src/hg/hgTracks/imageV2.h
index 9ec4e8f..762b802 100644
--- src/hg/hgTracks/imageV2.h
+++ src/hg/hgTracks/imageV2.h
@@ -1,5 +1,8 @@
 /* imageV2 - API for creating the image V2 features. */
 
+#ifndef IMAGEV2_H
+#define IMAGEV2_H
+
 // UNCOMMENT
 //   IMAGEv2_DRAG_REORDER to allow dragReorder
 //   USE_NAVIGATION_LINKS to use navigation links by image, rather than buttons at top
@@ -27,12 +30,14 @@
 // UNCOMMENT FLAT_TRACK_LIST to allow reordering of subtracks
 #ifdef IMAGEv2_DRAG_REORDER
     #define FLAT_TRACK_LIST
-    #define SUBTRACKS_HAVE_VIS
 #endif//def IMAGEv2_DRAG_REORDER
 
 // UNCOMMENT SUBTRACKS_HAVE_VIS to allow vis setting in cart for subtrack to override composite->view->subtrack vis rules.
 #ifdef FLAT_TRACK_LIST
+    #include "searchTracks.h"
+    #if defined(CONTEXT_MENU) || defined(TRACK_SEARCH)
     #define SUBTRACKS_HAVE_VIS
+    #endif
 #endif//def FLAT_TRACK_LIST
 
 // Support for guidelines as separate bg image (allowing dragScroll to move guidelines through centerLabels)
@@ -48,9 +53,6 @@
 // o image should be clear and background image should contain stripes
 // o Dynamic height for data/label based on image map currently in portal: DONE for packed, but full map items span all of data slice!
 
-#ifndef IMAGEV2_H
-#define IMAGEV2_H
-
 extern struct imgBox   *theImgBox;   // Make this global for now to avoid huge rewrite
 //extern struct image    *theOneImg;   // Make this global for now to avoid huge rewrite
 extern struct imgTrack *curImgTrack; // Make this global for now to avoid huge rewrite