Merge branch 'develop' into bug/JAL-1841rnaSecStr

[jalview.git] / src / jalview / datamodel / Sequence.java

diff --git a/src/jalview/datamodel/Sequence.java b/src/jalview/datamodel/Sequence.java
index 31ffdfd..a857712 100755 (executable)
--- a/src/jalview/datamodel/Sequence.java
+++ b/src/jalview/datamodel/Sequence.java
@@ -303,8 +303,13 @@ public class Sequence extends ASequence implements SequenceI
     }
     else
     {
-      System.err
+      if (datasetSequence.getSequenceFeatures() != features
+              && datasetSequence.getSequenceFeatures() != null
+              && datasetSequence.getSequenceFeatures().length > 0)
+      {
+        System.err
               .println("Warning: JAL-2046 side effect ? Possible implementation error: overwriting dataset sequence features by setting sequence features on alignment");
+      }
       datasetSequence.setSequenceFeatures(features);
     }
   }