From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 13 Sep 2017 09:01:36 +0000 (+0100)
Subject: JAL-2727 null additional references on close
X-Git-Tag: Release_2_10_3b1~74^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=9b600c9d9f31e24560ca460bfe214e15bfe90408;p=jalview.git

JAL-2727 null additional references on close
---

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index 9b74007..c8a0e1a 100644
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -1621,8 +1621,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
     if (av != null)
     {
       av.removePropertyChangeListener(propertyChangeListener);
-      jalview.structure.StructureSelectionManager ssm = av
-              .getStructureSelectionManager();
+      propertyChangeListener = null;
+      StructureSelectionManager ssm = av.getStructureSelectionManager();
       ssm.removeStructureViewerListener(getSeqPanel(), null);
       ssm.removeSelectionListener(getSeqPanel());
       ssm.removeCommandListener(av);
diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index a66855e..a8afe9a 100644
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -948,11 +948,11 @@ public abstract class AlignmentViewport
     groupConsensus = null;
     groupConservation = null;
     hconsensus = null;
+    hconservation = null;
     hcomplementConsensus = null;
     gapcounts = null;
-    // colour scheme may hold reference to consensus
-    residueShading = null;
-    // TODO remove listeners from changeSupport?
+    calculator = null;
+    residueShading = null; // may hold a reference to Consensus
     changeSupport = null;
     ranges = null;
     setAlignment(null);