git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: aa3cf1b)
Merge branch 'releases/Release_2_10_Branch' into develop
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 11 Oct 2016 11:10:18 +0000 (12:10 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 11 Oct 2016 11:10:18 +0000 (12:10 +0100)
src/jalview/gui/Jalview2XML.java patch | blob | history

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 9a8e5f6..a4e5785 100644 (file)
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -3018,7 +3018,8 @@ public class Jalview2XML
                 entry.setType(PDBEntry.Type.FILE);
               }
             }
-            if (ids[p].getFile() != null)
+            // jprovider is null when executing 'New View'
+            if (ids[p].getFile() != null && jprovider != null)
             {
               if (!pdbloaded.containsKey(ids[p].getFile()))
               {