JAL-2426 Checks on conservation thread in case we are shutting down
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 28 Feb 2017 12:25:11 +0000 (12:25 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 28 Feb 2017 12:25:11 +0000 (12:25 +0000)
src/jalview/workers/ConservationThread.java

index e71c4f5..b2a67b7 100644 (file)
@@ -55,7 +55,7 @@ public class ConservationThread extends AlignCalcWorker
     {
       calcMan.notifyStart(this); // updatingConservation = true;
 
-      while (!calcMan.notifyWorking(this))
+      while ((calcMan != null) && (!calcMan.notifyWorking(this)))
       {
         try
         {
@@ -69,7 +69,8 @@ public class ConservationThread extends AlignCalcWorker
           ex.printStackTrace();
         }
       }
-      if (alignViewport.isClosed())
+      if ((alignViewport == null) || (calcMan == null)
+              || (alignViewport.isClosed()))
       {
         abortAndDestroy();
         return;