git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: c346dab)
JAL-1476 JAL-1016 avoid NPE messiness if structures fail to align for some reason
authorJim Procter <jprocter@dundee.ac.uk>
Sat, 19 Apr 2014 12:53:11 +0000 (13:53 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 21 Apr 2014 13:09:19 +0000 (14:09 +0100)
src/jalview/gui/AppJmol.java patch | blob | history

diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java
index cc37b66..81b88ac 100644 (file)
--- a/src/jalview/gui/AppJmol.java
+++ b/src/jalview/gui/AppJmol.java
@@ -829,7 +829,7 @@ public class AppJmol extends GStructureViewer implements Runnable,
 
       // need to wait around until script has finished
       while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
-              : (jmb.isFinishedInit() && jmb.getPdbFile().length != jmb.pdbentry.length))
+              : (jmb.isFinishedInit() && jmb.getPdbFile()!=null && jmb.getPdbFile().length != jmb.pdbentry.length))
       {
         try
         {