X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=315b14123b2b3f50a8adc352fcc15e8127ea3520;hb=f5a39f4861d0f1ffdb3c5b542e00907b2cc18a73;hp=417eb8c591c93b6c2c05c142bfc93823ccd1070a;hpb=7d4faec78c1f439321625557e09e574bc6211e8d;p=jalview.git

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index 417eb8c..315b141 100755
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -108,7 +108,6 @@ public class AnnotationPanel extends JPanel implements MouseListener,
     public int adjustPanelHeight()
     {
         // setHeight of panels
-        image = null;
         AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();
         int height = 0;
 
@@ -659,6 +658,10 @@ public class AnnotationPanel extends JPanel implements MouseListener,
     {
       if(av.updatingConsensus || av.updatingConservation)
       {
+        if(image==null)
+         {
+           return;
+         }
         //We'll keep a record of the old image,
         //and draw a faded image until the calculation
         //has completed