JAL-4217 JAL-629 built in 25s time out waiting for structure viewer to load data...

diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java
index d83afed..d7d1ea3 100644 (file)
--- a/src/jalview/bin/Commands.java
+++ b/src/jalview/bin/Commands.java
@@ -576,15 +576,21 @@ public class Commands
           }
           try
           {
-            while (sv.isBusy())
+            long tries=1000;
+            while (sv.isBusy() && tries>0)
             {
               Thread.sleep(25);
               if (sv.isBusy())
               {
+                tries--;
                 Console.debug(
                         "Waiting for viewer for " + structureFilepath);
               }
             }
+            if (tries==0 && sv.isBusy())
+            {
+              Console.warn("Gave up waiting for structure viewer to load. Something may have gone wrong.");
+            }
           } catch (Exception x)
           {
             Console.warn("Exception whilst waiting for structure viewer "+structureFilepath,x);