From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 14 Aug 2006 15:11:12 +0000 (+0000)
Subject: Stop loading must be before JOptionPane, 1.5 bug
X-Git-Tag: Release_2_1~72
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=db52eb78dae4debd37d0a325ba55e5a33238df31;hp=d6727c1e58abdd1acbce92174deff74c533e4587;p=jalview.git

Stop loading must be before JOptionPane, 1.5 bug
---

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index d6a0112..1f2cbb1 100755
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -820,6 +820,9 @@ 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");
@@ -831,6 +834,9 @@ public class Jalview2XML
         }
         catch (Exception ex)
         {
+          if (Desktop.instance != null)
+            Desktop.instance.stopLoading();
+
           //Is Version 1 Jar file?
           af =  new Jalview2XML_V1().LoadJalviewAlign(file);