JAL-2135 NPE bugfix when parsing a structure file with Jmol and id & inFile is null

diff --git a/src/jalview/ext/jmol/JmolParser.java b/src/jalview/ext/jmol/JmolParser.java
index c514503..5effd2e 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((inFile != null) ? inFile.getName() : safeName(getDataName()));
       }
       for (PDBChain chain : getChains())
       {