X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=a3a23964579116ad01f4bb1881014106f729d703;hb=dd74fc4938723fe5ec48d4e5fdcfbe58ac42a48d;hp=24058089d7f1b16c5255f90b2a77d1c059d9816f;hpb=38a10817438b42f7cba2ee95d4d65cb9672926ab;p=jalview.git diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 2405808..a3a2396 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++; } @@ -572,9 +579,9 @@ public class FeatureSettings extends JPanel int iSize; if(af.getViewport().getSelectionGroup()!=null - && af.getViewport().getSelectionGroup().getSize(false)>0) + && af.getViewport().getSelectionGroup().getSize()>0) { - iSize = af.getViewport().getSelectionGroup().getSize(false); + iSize = af.getViewport().getSelectionGroup().getSize(); dataset = new SequenceI[iSize]; seqs = af.getViewport().getSelectionGroup(). getSequencesInOrder(