Merge branch 'releases/Release_2_11_3_Branch'

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

diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java
index ba4eb9c..0aa4878 100644 (file)
--- a/src/jalview/gui/AppJmol.java
+++ b/src/jalview/gui/AppJmol.java
@@ -503,10 +503,17 @@ public class AppJmol extends StructureViewerBase
                 }
               });
       runner.start();
+      long time = 0;
       do
       {
         Thread.sleep(25);
-      } while (runner.isAlive());
+      } while (runner.isAlive() && time++ < 4000);
+      if (time >= 4000)
+      {
+        runner.interrupt();
+        throw new ImageOutputException(
+                "Jmol took too long to export. Waited for 100 seconds.");
+      }
     } catch (Throwable e)
     {
       throw new ImageOutputException(