JAL-1778 reinstated this.ssm to handle 'close all windows' robustly

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

diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java
index 35cd3e5..5c3785a 100644 (file)
--- a/src/jalview/gui/AppVarna.java
+++ b/src/jalview/gui/AppVarna.java
@@ -463,14 +463,10 @@ public class AppVarna extends JInternalFrame implements
     /*
      * Deregister as a listener, to free references to this object
      */
-    if (ap != null)
+    if (ssm != null)
     {
-      StructureSelectionManager ssm = ap.getStructureSelectionManager();
-      if (ssm != null)
-      {
-        ssm.removeStructureViewerListener(AppVarna.this, null);
-        ssm.removeSelectionListener(AppVarna.this);
-      }
+      ssm.removeStructureViewerListener(AppVarna.this, null);
+      ssm.removeSelectionListener(AppVarna.this);
     }
   }