X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalview2XML.java;h=b8466f0872e22923a9c7688fbf447c40add60d08;hb=61505ac1511435b067e647f5c7c9050e5c1eef41;hp=1f2cbb1708024243be75be38434d2a4cf228e8d0;hpb=2794d58ed2b048de8cad254bea750f69d859240d;p=jalview.git

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 1f2cbb1..b8466f0 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -765,7 +765,7 @@ public class Jalview2XML
      *
      * @param file DOCUMENT ME!
      */
-    public AlignFrame LoadJalviewAlign(String file)
+    public AlignFrame LoadJalviewAlign(final String file)
     {
         jalview.gui.AlignFrame af = null;
         try
@@ -820,22 +820,23 @@ public class Jalview2XML
         }
         catch(java.net.UnknownHostException ex)
         {
-          if (Desktop.instance != null)
-            Desktop.instance.stopLoading();
-
           ex.printStackTrace();
           System.err.println("Couldn't locate Jalview XML file : " +
               ex + "\n");
-           JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                    "Couldn't locate " + file,
-                                    "URL not found",
-                                    JOptionPane.WARNING_MESSAGE);
 
+          javax.swing.SwingUtilities.invokeLater(new Runnable()
+          {
+            public void run()
+            {
+              JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                  "Couldn't locate " + file,
+                  "URL not found",
+                  JOptionPane.WARNING_MESSAGE);
+            }
+          });
         }
         catch (Exception ex)
         {
-          if (Desktop.instance != null)
-            Desktop.instance.stopLoading();
 
           //Is Version 1 Jar file?
           af =  new Jalview2XML_V1().LoadJalviewAlign(file);
@@ -848,11 +849,16 @@ public class Jalview2XML
           ex.printStackTrace();
             System.err.println("Exception whilst loading jalview XML file : " +
                 ex + "\n");
-             JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                                      "Error loading  " + file,
-                                      "Error loading Jalview file",
-                                      JOptionPane.WARNING_MESSAGE);
+            javax.swing.SwingUtilities.invokeLater(new Runnable()
+            {
+              public void run()
+              {
 
+                JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                    "Error loading  " + file,
+                    "Error loading Jalview file",
+                    JOptionPane.WARNING_MESSAGE);
+              }});
         }
 
         return af;