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
patch for JAL-699 so conservation/consensus threads restart correctly
[jalview.git]
/
src
/
jalview
/
gui
/
ConservationThread.java
diff --git
a/src/jalview/gui/ConservationThread.java
b/src/jalview/gui/ConservationThread.java
index
fa70bcc
..
92f66da
100644
(file)
--- a/
src/jalview/gui/ConservationThread.java
+++ b/
src/jalview/gui/ConservationThread.java
@@
-60,9
+60,12
@@
class ConservationThread extends Thread
AlignViewport.UPDATING_CONSERVATION = true;
AlignViewport.UPDATING_CONSERVATION = true;
- int alWidth = this.alignViewport.alignment.getWidth();
- if (alWidth < 0)
+ int alWidth;
+
+ if (alignViewport==null || alignViewport.alignment==null || (alWidth=alignViewport.alignment.getWidth())< 0)
{
{
+ this.alignViewport.updatingConservation = false;
+ AlignViewport.UPDATING_CONSERVATION = false;
return;
}
return;
}