X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmol.java;h=0aa4878d9263504541fa8bacf8f8a5ea6a76d328;hb=e57f77dc13f5a295cf49a403da05770a68a6e22b;hp=5b935b7d6c18dc70ea019df099d8eedef5e03d20;hpb=14488926488f05f802480c508da1cc4ed53c5b1a;p=jalview.git

diff --git a/src/jalview/gui/AppJmol.java b/src/jalview/gui/AppJmol.java
index 5b935b7..0aa4878 100644
--- a/src/jalview/gui/AppJmol.java
+++ b/src/jalview/gui/AppJmol.java
@@ -434,7 +434,7 @@ public class AppJmol extends StructureViewerBase
     try
     {
       makePDBImage(null, type, null,
-              BitmapImageSizing.defaultBitmapImageSizing(), null);
+              BitmapImageSizing.defaultBitmapImageSizing());
     } catch (ImageOutputException ioex)
     {
       Console.error("Unexpected error whilst writing " + type.toString(),
@@ -443,8 +443,7 @@ public class AppJmol extends StructureViewerBase
   }
 
   public void makePDBImage(File file, ImageMaker.TYPE type, String renderer,
-          BitmapImageSizing userBis, List<String> extraCommands)
-          throws ImageOutputException
+          BitmapImageSizing userBis) throws ImageOutputException
   {
     int width = getWidth();
     int height = getHeight();
@@ -473,24 +472,8 @@ public class AppJmol extends StructureViewerBase
           }
         }
 
-        String saveStateNameTemp = "JalviewSaveStateTemp";
-        jmb.executeCommand(
-                new StructureCommand("save STATE " + saveStateNameTemp),
-                false);
-
-        if (extraCommands != null)
-        {
-          for (String cmd : extraCommands)
-          {
-            jmb.executeCommand(new StructureCommand(cmd), false);
-          }
-        }
-
         jmb.jmolViewer.requestRepaintAndWait("image export");
         jmb.jmolViewer.renderScreenImage(ig2, usewidth, useheight);
-        jmb.executeCommand(
-                new StructureCommand("restore STATE " + saveStateNameTemp),
-                false);
       }
     };
     String view = MessageManager.getString("action.view")
@@ -520,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(