formatting

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

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 2405808..a3a2396 100755 (executable)
--- 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;\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
@@ -572,9 +579,9 @@ public class FeatureSettings extends JPanel
     int iSize;\r
 \r
     if(af.getViewport().getSelectionGroup()!=null\r
-      && af.getViewport().getSelectionGroup().getSize(false)>0)\r
+      && af.getViewport().getSelectionGroup().getSize()>0)\r
     {\r
-      iSize = af.getViewport().getSelectionGroup().getSize(false);\r
+      iSize = af.getViewport().getSelectionGroup().getSize();\r
       dataset = new SequenceI[iSize];\r
       seqs = af.getViewport().getSelectionGroup().\r
           getSequencesInOrder(\r