From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 11 Oct 2016 11:10:18 +0000 (+0100)
Subject: Merge branch 'releases/Release_2_10_Branch' into develop
X-Git-Tag: Release_2_10_0b1~3^2~15^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2eb3c4aee99fabe1ea5dbe6e90ec40c3011abfe2;hp=aa3cf1b48ce4735d980fa5616dfacab458ecefe2;p=jalview.git

Merge branch 'releases/Release_2_10_Branch' into develop
---

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 9a8e5f6..a4e5785 100644
--- 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()))
               {