git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop loading must be before JOptionPane, 1.5 bug
[jalview.git]
/
src
/
jalview
/
gui
/
Jalview2XML.java
diff --git
a/src/jalview/gui/Jalview2XML.java
b/src/jalview/gui/Jalview2XML.java
index
d6a0112
..
1f2cbb1
100755
(executable)
--- a/
src/jalview/gui/Jalview2XML.java
+++ b/
src/jalview/gui/Jalview2XML.java
@@
-820,6
+820,9
@@
public class Jalview2XML
}
\r
catch(java.net.UnknownHostException ex)
\r
{
\r
}
\r
catch(java.net.UnknownHostException ex)
\r
{
\r
+ if (Desktop.instance != null)
\r
+ Desktop.instance.stopLoading();
\r
+
\r
ex.printStackTrace();
\r
System.err.println("Couldn't locate Jalview XML file : " +
\r
ex + "\n");
\r
ex.printStackTrace();
\r
System.err.println("Couldn't locate Jalview XML file : " +
\r
ex + "\n");
\r
@@
-831,6
+834,9
@@
public class Jalview2XML
}
\r
catch (Exception ex)
\r
{
\r
}
\r
catch (Exception ex)
\r
{
\r
+ if (Desktop.instance != null)
\r
+ Desktop.instance.stopLoading();
\r
+
\r
//Is Version 1 Jar file?
\r
af = new Jalview2XML_V1().LoadJalviewAlign(file);
\r
\r
//Is Version 1 Jar file?
\r
af = new Jalview2XML_V1().LoadJalviewAlign(file);
\r
\r