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
Merge branch 'releases/Release_2_11_3_Branch'
[jalview.git]
/
src
/
jalview
/
gui
/
SplashScreen.java
diff --git
a/src/jalview/gui/SplashScreen.java
b/src/jalview/gui/SplashScreen.java
index
ff409e0
..
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;
@@
-113,8
+114,11
@@
public class SplashScreen extends JPanel
*/
public SplashScreen(boolean isTransient)
{
*/
public SplashScreen(boolean isTransient)
{
- Desktop.instance.acquireDialogQueue();
this.transientDialog = isTransient;
this.transientDialog = isTransient;
+ if (this.transientDialog)
+ {
+ Desktop.instance.acquireDialogQueue();
+ }
if (Platform.isJS()) // BH 2019
{
if (Platform.isJS()) // BH 2019
{
@@
-228,7
+232,8
@@
public class SplashScreen extends JPanel
protected boolean refreshText()
{
String newtext = Desktop.instance.getAboutMessage();
protected boolean refreshText()
{
String newtext = Desktop.instance.getAboutMessage();
- // jalview.bin.Console.errPrintln("Text found: \n"+newtext+"\nEnd of newtext.");
+ // jalview.bin.Console.errPrintln("Text found: \n"+newtext+"\nEnd of
+ // newtext.");
if (oldTextLength != newtext.length())
{
iframe.setVisible(false);
if (oldTextLength != newtext.length())
{
iframe.setVisible(false);
@@
-324,7
+329,6
@@
public class SplashScreen extends JPanel
}
closeSplash();
}
closeSplash();
- Desktop.instance.releaseDialogQueue();
}
/**
}
/**
@@
-332,10
+336,26
@@
public class SplashScreen extends JPanel
*/
public void closeSplash()
{
*/
public void closeSplash()
{
+ if (this.transientDialog)
+ {
+ Desktop.instance.releaseDialogQueue();
+ }
try
{
try
{
-
- iframe.setClosed(true);
+ 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)
{
}