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
JAL-4217 close internal frame on the swing thread to avoid deadlock
[jalview.git]
/
src
/
jalview
/
gui
/
SplashScreen.java
diff --git
a/src/jalview/gui/SplashScreen.java
b/src/jalview/gui/SplashScreen.java
index
1060d8a
..
465bc0d
100755
(executable)
--- a/
src/jalview/gui/SplashScreen.java
+++ b/
src/jalview/gui/SplashScreen.java
@@
-36,6
+36,7
@@
import javax.swing.JLabel;
import javax.swing.JLayeredPane;
import javax.swing.JPanel;
import javax.swing.JTextPane;
import javax.swing.JLayeredPane;
import javax.swing.JPanel;
import javax.swing.JTextPane;
+import javax.swing.SwingUtilities;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkListener;
@@
-341,8
+342,20
@@
public class SplashScreen extends JPanel
}
try
{
}
try
{
-
- iframe.setClosed(true); // ##### implicated BLOCKED
+ final JInternalFrame frme = iframe;
+ SwingUtilities.invokeLater(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ frme.setClosed(true);
+ } catch (Exception ex)
+ {
+ }
+ }
+ });
} catch (Exception ex)
{
}
} catch (Exception ex)
{
}