From 653144053dfcfcde800beb1fa81a6870775a8034 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Sat, 19 Apr 2014 13:53:11 +0100 Subject: [PATCH] JAL-1476 JAL-1016 avoid NPE messiness if structures fail to align for some reason --- src/jalview/gui/AppJmol.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java index cc37b66..81b88ac 100644 --- 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 { -- 1.7.10.2