From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 26 Nov 2014 14:26:39 +0000 (+0000)
Subject: JAL-1528 NullPointer check / more informative PDB fetch status bar
X-Git-Tag: Release_2_8_2b1^2~14
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=0616883e9c584c0f8600cfec79d9bf50cde337a4;p=jalview.git

JAL-1528 NullPointer check / more informative PDB fetch status bar
---

diff --git a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index fb03f04..0042041 100644
--- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@ -782,7 +782,7 @@ public abstract class JalviewChimeraBinding extends
 
   private void waitForChimera()
   {
-    while (viewer.isBusy())
+    while (viewer != null && viewer.isBusy())
     {
       try {
         Thread.sleep(15);
diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java
index 02865e1..513659f 100644
--- a/src/jalview/gui/ChimeraViewFrame.java
+++ b/src/jalview/gui/ChimeraViewFrame.java
@@ -840,8 +840,13 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable,
     {
       if (progressBar != null)
       {
-        progressBar.setProgressBar(
-                MessageManager.getString("label.state_completed"), hdl);
+        progressBar
+                .setProgressBar(
+                        pdbid
+                                + " "
+                                + MessageManager
+                                        .getString("label.state_completed"),
+                        hdl);
       }
     }
     /*