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-1184 apparent deadlock when launching jalview on w7 - attempt to patch
[jalview.git]
/
src
/
jalview
/
gui
/
PromptUserConfig.java
diff --git
a/src/jalview/gui/PromptUserConfig.java
b/src/jalview/gui/PromptUserConfig.java
index
fae7783
..
f05459b
100644
(file)
--- a/
src/jalview/gui/PromptUserConfig.java
+++ b/
src/jalview/gui/PromptUserConfig.java
@@
-1,6
+1,6
@@
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
/*
* Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-200,8
+200,8
@@
public class PromptUserConfig implements Runnable
}
try
{
}
try
{
- int reply = JOptionPane.showInternalConfirmDialog(
- Desktop.desktop, // component,
+ int reply = JOptionPane.showConfirmDialog(
+ null, // component,
dialogText, dialogTitle,
(allowCancel) ? JOptionPane.YES_NO_CANCEL_OPTION
: JOptionPane.YES_NO_OPTION,
dialogText, dialogTitle,
(allowCancel) ? JOptionPane.YES_NO_CANCEL_OPTION
: JOptionPane.YES_NO_OPTION,