From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 8 Aug 2017 15:44:45 +0000 (+0100)
Subject: JAL-2560 alternative fix (reinstate lost line of code)
X-Git-Tag: Release_2_10_3b1~132^2~12
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7bd8dd38f8ba6cbec54343bc4ac04ee21b8de776;p=jalview.git

JAL-2560 alternative fix (reinstate lost line of code)
---

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index 70f16d9..2881e81 100644
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -641,22 +641,13 @@ public abstract class AlignmentViewport implements AlignViewportI,
     {
       if (getConservationSelected())
       {
-        int retry = 0;
-        synchronized (this)
-        {
-          while (isCalcInProgress() && retry < 10)
-          {
-            try
-            {
-              wait(50);
-              retry++;
-            } catch (InterruptedException e)
-            {
-            }
-          }
-        }
         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);
     }