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 ac15f2b..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.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -200,12 +200,18 @@ public class PromptUserConfig implements Runnable
     }
     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,
               JOptionPane.QUESTION_MESSAGE);
+      // now, ask the desktop to relayer any external windows that might have been obsured
+      if (Desktop.instance!=null)
+      {
+        Desktop.instance.relayerWindows();
+      }
+      // and finish parsing the result
       jalview.bin.Cache.log.debug("Got response : " + reply);
       if (reply == JOptionPane.YES_OPTION)
       {