git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-2346annotationChoice
[jalview.git]
/
src
/
jalview
/
workers
/
ConservationThread.java
diff --git
a/src/jalview/workers/ConservationThread.java
b/src/jalview/workers/ConservationThread.java
index
e71c4f5
..
571234c
100644
(file)
--- 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;
{
calcMan.notifyStart(this); // updatingConservation = true;
- while (!calcMan.notifyWorking(this))
+ while ((calcMan != null) && (!calcMan.notifyWorking(this)))
{
try
{
{
try
{
@@
-69,7
+69,8
@@
public class ConservationThread extends AlignCalcWorker
ex.printStackTrace();
}
}
ex.printStackTrace();
}
}
- if (alignViewport.isClosed())
+ if ((alignViewport == null) || (calcMan == null)
+ || (alignViewport.isClosed()))
{
abortAndDestroy();
return;
{
abortAndDestroy();
return;
@@
-114,6
+115,12
@@
public class ConservationThread extends AlignCalcWorker
}
calcMan.workerComplete(this);
}
calcMan.workerComplete(this);
+ if ((alignViewport == null) || (calcMan == null)
+ || (alignViewport.isClosed()))
+ {
+ abortAndDestroy();
+ return;
+ }
if (ap != null)
{
ap.paintAlignment(true);
if (ap != null)
{
ap.paintAlignment(true);