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
JAL-2560 alternative fix (reinstate lost line of code)
[jalview.git]
/
src
/
jalview
/
viewmodel
/
AlignmentViewport.java
diff --git
a/src/jalview/viewmodel/AlignmentViewport.java
b/src/jalview/viewmodel/AlignmentViewport.java
index
70f16d9
..
2881e81
100644
(file)
--- a/
src/jalview/viewmodel/AlignmentViewport.java
+++ b/
src/jalview/viewmodel/AlignmentViewport.java
@@
-641,22
+641,13
@@
public abstract class AlignmentViewport implements AlignViewportI,
{
if (getConservationSelected())
{
{
if (getConservationSelected())
{
- int retry = 0;
- synchronized (this)
- {
- while (isCalcInProgress() && retry < 10)
- {
- try
- {
- wait(50);
- retry++;
- } catch (InterruptedException e)
- {
- }
- }
- }
residueShading.setConservation(hconservation);
}
residueShading.setConservation(hconservation);
}
+ /*
+ * reset conservation flag in case just set to false if
+ * Conservation was null (calculation still in progress)
+ */
+ residueShading.setConservationApplied(getConservationSelected());
residueShading.alignmentChanged(alignment, hiddenRepSequences);
}
residueShading.alignmentChanged(alignment, hiddenRepSequences);
}