JAL-3562 belt and braces - wait before check, and also check validity of swing component

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index b7d292f..ceef079 100644 (file)
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -60,17 +60,18 @@ public class AlignmentPanelTest
      */
     synchronized (this)
     {
-      while (af.getViewport().isCalcInProgress()
-              || Toolkit.getDefaultToolkit().getSystemEventQueue()
-                      .peekEvent() != null)
+      do 
       {
         try
         {
-          wait(50);
+          wait(70);
         } catch (InterruptedException e)
         {
         }
-      }
+      } while (af.getViewport().isCalcInProgress()
+              || Toolkit.getDefaultToolkit().getSystemEventQueue()
+                      .peekEvent() != null
+              || !af.alignPanel.isValid());
     }
   }