From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 11 Dec 2020 07:51:51 +0000 (+0000)
Subject: JAL-1713 fix typo; overview in project with open overview in preferences
X-Git-Tag: Release_2_11_3_0~18^2~20^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7ef5bcab5bca73d8a5ba1dd8db67fcf7888a6d46;hp=e3944f6873e7855afb284bb2f0251cd4e7fc1637;p=jalview.git

JAL-1713 fix typo; overview in project with open overview in preferences
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 2c079b8..6916a55 100644
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -3375,11 +3375,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
   @Override
   public void overviewMenuItem_actionPerformed(ActionEvent e)
   {
-    if (alignPanel.overviewPanel != null)
-    {
-      return;
-    }
-
     boolean showHiddenRegions = Cache.getDefault(Preferences.SHOW_OV_HIDDEN_AT_START,
                 false);
     openOverviewPanel(showHiddenRegions);
@@ -3387,6 +3382,10 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
   public OverviewPanel openOverviewPanel(boolean showHidden)
   {
+    if (alignPanel.overviewPanel != null)
+    {
+      return alignPanel.overviewPanel;
+    }
     JInternalFrame frame = new JInternalFrame();
     final OverviewPanel overview = new OverviewPanel(alignPanel, showHidden);
     frame.setContentPane(overview);
diff --git a/src/jalview/renderer/OverviewResColourFinder.java b/src/jalview/renderer/OverviewResColourFinder.java
index 89dc9e7..ef4d04b 100644
--- a/src/jalview/renderer/OverviewResColourFinder.java
+++ b/src/jalview/renderer/OverviewResColourFinder.java
@@ -152,6 +152,6 @@ public class OverviewResColourFinder extends ResidueColourFinder
    */
   public Color getResidueColour()
   {
-    return gapColour;
+    return residueColour;
   }
 }