From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 24 Oct 2017 16:09:42 +0000 (+0100)
Subject: Merge branch 'features/JAL-2608closeOverview' into develop
X-Git-Tag: Release_2_10_3b1~86
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7544cc610aa35fd10e975598cc8fb2c97abe6bd9;p=jalview.git

Merge branch 'features/JAL-2608closeOverview' into develop
---

7544cc610aa35fd10e975598cc8fb2c97abe6bd9
diff --cc src/jalview/gui/OverviewPanel.java
index 51d7a84,7cbe8b7..9ddb751
--- a/src/jalview/gui/OverviewPanel.java
+++ b/src/jalview/gui/OverviewPanel.java
@@@ -350,11 -318,22 +352,25 @@@ public class OverviewPanel extends JPan
    {
      try
      {
-       av.getRanges().removePropertyChangeListener(this);
+       if (av != null)
+       {
+         av.getRanges().removePropertyChangeListener(this);
+       }
+ 
 +      oviewCanvas.dispose();
++
+       /*
+        * close the parent frame (which also removes it from the
+        * Desktop Windows menu)
+        */
+       ((JInternalFrame) SwingUtilities.getAncestorOfClass(
+               JInternalFrame.class, (this))).setClosed(true);
+     } catch (PropertyVetoException e)
+     {
+       // ignore
      } finally
      {
 +      progressPanel = null;
        av = null;
        oviewCanvas = null;
        ap = null;