Dont make new frame reference in Buildwebservicemenu

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index c1d383e..541c9e1 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -97,11 +97,9 @@ public class AlignFrame
   /* Set up intrinsic listeners for dynamically generated GUI bits. */\r
   private void addServiceListeners()\r
   {\r
-\r
-    final AlignFrame thisFrame = this;\r
     final java.beans.PropertyChangeListener thisListener;\r
     // Do this once to get current state\r
-    thisFrame.BuildWebServiceMenu();\r
+    BuildWebServiceMenu();\r
     Desktop.discoverer.addPropertyChangeListener(\r
         thisListener = new java.beans.PropertyChangeListener()\r
     {\r
@@ -111,7 +109,7 @@ public class AlignFrame
         if (evt.getPropertyName().equals("services"))\r
         {\r
           // System.out.println("Rebuilding web service menu");\r
-          thisFrame.BuildWebServiceMenu();\r
+          BuildWebServiceMenu();\r
         }\r
       }\r
     });\r
@@ -123,6 +121,7 @@ public class AlignFrame
       {\r
         // System.out.println("deregistering discoverer listener");\r
         Desktop.discoverer.removePropertyChangeListener(thisListener);\r
+        closeMenuItem_actionPerformed(null);\r
       }\r
       ;\r
     });\r
@@ -348,6 +347,7 @@ public class AlignFrame
   {\r
     try\r
     {\r
+      PaintRefresher.components.remove(viewport.alignment);\r
       this.setClosed(true);\r
     }\r
     catch (Exception ex)\r