Merge branch 'develop' into features/JAL-2110_crossRefDuplications

diff --git a/help/html/releases.html b/help/html/releases.html
index 0e7d02d..dfb747f 100755 (executable)
--- a/help/html/releases.html
+++ b/help/html/releases.html
@@ -92,6 +92,7 @@
             <li><!--  JAL-2085  -->Cannot save project when view has a reference sequence defined</li>
             <li><!--  JAL-1011  -->Columns are suddenly selected in other alignments and views when revealing hidden columns</li>
             <li><!--  JAL-1989  -->Hide columns not mirrored in complement view in a cDNA/Protein splitframe</li>
+            <li><!--  JAL-1369 -->Cannot save/restore representative sequence from project when only one sequence is represented</li>
             <!--  may exclude, this is an external service stability issue  JAL-1941 /> RNA 3D structure not added via DSSR service</li> -->
           </ul>
           <em>Applet</em>

diff --git a/src/jalview/ext/jmol/JmolParser.java b/src/jalview/ext/jmol/JmolParser.java
index c514503..a791558 100644 (file)
--- a/src/jalview/ext/jmol/JmolParser.java
+++ b/src/jalview/ext/jmol/JmolParser.java
@@ -172,7 +172,7 @@ public class JmolParser extends StructureFile implements JmolStatusListener
 
       if (getId() == null)
       {
-        setId(inFile.getName());
+        setId(safeName(getDataName()));
       }
       for (PDBChain chain : getChains())
       {