From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 2 Nov 2006 15:13:34 +0000 (+0000)
Subject: return if image is null
X-Git-Tag: Release_2_2~186
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=324bee493b9dff84a73b610fb4234b72f9f20503;p=jalview.git

return if image is null
---

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