updated version to 2.6.1

[jalview.git] / src / jalview / gui / ConservationThread.java

diff --git a/src/jalview/gui/ConservationThread.java b/src/jalview/gui/ConservationThread.java
index 3e0c923..27455f6 100644 (file)
--- a/src/jalview/gui/ConservationThread.java
+++ b/src/jalview/gui/ConservationThread.java
@@ -1,5 +1,5 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6.1)
  * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
@@ -60,9 +60,12 @@ class ConservationThread extends Thread
 
       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;
       }
 
@@ -85,7 +88,6 @@ class ConservationThread extends Thread
 
       this.alignViewport.conservation = null;
       this.alignViewport.quality = null;
-
     }
 
     AlignViewport.UPDATING_CONSERVATION = false;