From 5ae21c312e4dcc80389bc4f5c534db9428db2217 Mon Sep 17 00:00:00 2001 From: kiramt Date: Tue, 28 Feb 2017 12:25:11 +0000 Subject: [PATCH] JAL-2426 Checks on conservation thread in case we are shutting down --- src/jalview/workers/ConservationThread.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/jalview/workers/ConservationThread.java b/src/jalview/workers/ConservationThread.java index e71c4f5..b2a67b7 100644 --- a/src/jalview/workers/ConservationThread.java +++ b/src/jalview/workers/ConservationThread.java @@ -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; -- 1.7.10.2