Merge remote-tracking branch 'origin/develop' into

[jalview.git] / src / jalview / gui / OverviewPanel.java

diff --git a/src/jalview/gui/OverviewPanel.java b/src/jalview/gui/OverviewPanel.java
index f9f3e4c..f58a2a5 100755 (executable)
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@ -60,7 +60,9 @@ public class OverviewPanel extends JPanel implements Runnable
     this.av = alPanel.av;
     this.ap = alPanel;
 
-    od = new OverviewDimensions(av.getRanges(), av.isShowAnnotation());
+    od = new OverviewDimensions(av.getRanges(),
+            (av.isShowAnnotation() && av
+                    .getAlignmentConservationAnnotation() != null));
 
     oviewCanvas = new OverviewCanvas(od, av, ap, this);
     setLayout(new BorderLayout());
@@ -141,7 +143,9 @@ public class OverviewPanel extends JPanel implements Runnable
   @Override
   public void run()
   {
-    oviewCanvas.draw(av.isShowSequenceFeatures(), av.isShowAnnotation());
+    oviewCanvas.draw(av.isShowSequenceFeatures(),
+            (av.isShowAnnotation() && av
+                    .getAlignmentConservationAnnotation() != null));
     setBoxPosition();
   }