JAL-3619 fix up error messages and try to bail quietly if the viewer doesn’t open

[jalview.git] / src / jalview / gui / PymolViewer.java

diff --git a/src/jalview/gui/PymolViewer.java b/src/jalview/gui/PymolViewer.java
index 3b6ea99..2fd4957 100644 (file)
--- a/src/jalview/gui/PymolViewer.java
+++ b/src/jalview/gui/PymolViewer.java
@@ -215,6 +215,14 @@ public class PymolViewer extends StructureViewerBase
           return;
         }
       }
+      if (!binding.isViewerRunning())
+      {
+        // nothing to do
+        // TODO: ensure we tidy up JAL-3619
+
+        return;
+      }
+
       int num = -1;
       for (PDBEntry pe : filePDB)
       {
@@ -252,7 +260,7 @@ public class PymolViewer extends StructureViewerBase
           } catch (Exception ex)
           {
             Console.error(
-                    "Couldn't open " + pe.getFile() + " in Chimera viewer!",
+                    "Couldn't open " + pe.getFile() + " in "+getViewerName()+"!",
                     ex);
           } finally
           {