JAL-2314 Tweaks to stop thread sync issues

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index dc16a57..32e5f64 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -2854,13 +2854,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
     if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
     {
-      if (jalview.ws.jws2.Jws2Discoverer.getDiscoverer().isRunning())
-      {
-        jalview.ws.jws2.Jws2Discoverer.getDiscoverer().setAborted(true);
-      }
       t2 = jalview.ws.jws2.Jws2Discoverer.getDiscoverer().startDiscoverer(
               changeSupport);
-
     }
     Thread t3 = null;
     {
@@ -2880,6 +2875,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
                 || (t2 != null && t2.isAlive())
                 || (t3 != null && t3.isAlive())
                 || (t0 != null && t0.isAlive());
+        // could just as easily ask discoverer if it is still running instead of
+        // holding ref to thread
       }
     }
   }