JAL-1588 error dialog if Chimera project opened on a m/c w/o Chimera

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

diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java
index 1915936..b933345 100644 (file)
--- a/src/jalview/gui/ChimeraViewFrame.java
+++ b/src/jalview/gui/ChimeraViewFrame.java
@@ -599,7 +599,17 @@ public class ChimeraViewFrame extends StructureViewerBase
     jalview.gui.Desktop.addInternalFrame(this, jmb.getViewerTitle("Chimera", true),
             getBounds().width, getBounds().height);
 
-    jmb.launchChimera();
+    if (!jmb.launchChimera())
+    {
+      JOptionPane
+              .showMessageDialog(
+                      Desktop.desktop,
+              MessageManager.getString("label.chimera_failed"),
+              MessageManager.getString("label.error_loading_file"),
+              JOptionPane.ERROR_MESSAGE);
+      this.dispose();
+      return;
+    }
 
     if (this.chimeraSessionFile != null)
     {