Colour may have been updated in another view
authoramwaterhouse <Andrew Waterhouse>
Tue, 21 Nov 2006 15:28:45 +0000 (15:28 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 21 Nov 2006 15:28:45 +0000 (15:28 +0000)
src/jalview/gui/FeatureSettings.java

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