X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAppVarna.java;h=5c3785a3d6b050bec34250482770efd615f54aaa;hb=93d63f3c608771bb48b5ac18f761194a1ea28554;hp=35cd3e58b6efeaf38cb5791607bc03bce6b22149;hpb=fd1c6fd67abdd50ff0d77410d3da9be66be315ce;p=jalview.git

diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java
index 35cd3e5..5c3785a 100644
--- 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);
     }
   }