JAL-2426 Removal of NPE in conservation thread when closing Jalview

[jalview.git] / src / jalview / workers / ConservationThread.java

diff --git a/src/jalview/workers/ConservationThread.java b/src/jalview/workers/ConservationThread.java
index b2a67b7..571234c 100644 (file)
--- a/src/jalview/workers/ConservationThread.java
+++ b/src/jalview/workers/ConservationThread.java
@@ -115,6 +115,12 @@ public class ConservationThread extends AlignCalcWorker
     }
     calcMan.workerComplete(this);
 
+    if ((alignViewport == null) || (calcMan == null)
+            || (alignViewport.isClosed()))
+    {
+      abortAndDestroy();
+      return;
+    }
     if (ap != null)
     {
       ap.paintAlignment(true);