From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 21 Nov 2006 15:28:45 +0000 (+0000)
Subject: Colour may have been updated in another view
X-Git-Tag: Release_2_2~73
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4e2a76c531103d213482fb4969da33287d35411b;p=jalview.git

Colour may have been updated in another view
---

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 2405808..7acd374 100755
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -294,6 +294,13 @@ public class FeatureSettings extends JPanel
       data[dataIndex][0] = type;
 
       data[dataIndex][1] = fr.getColour(type);
+      if (data[dataIndex][1] == null)
+      {
+        //"Colour has been updated in another view!!"
+        fr.renderOrder = null;
+        return;
+      }
+
       data[dataIndex][2] = new Boolean(true);
       dataIndex++;
     }