JAL-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...

[jalview.git] / src / jalview / gui / OOMWarning.java

diff --git a/src/jalview/gui/OOMWarning.java b/src/jalview/gui/OOMWarning.java
index 7b9da79..dc5d0f5 100644 (file)
--- a/src/jalview/gui/OOMWarning.java
+++ b/src/jalview/gui/OOMWarning.java
@@ -72,18 +72,18 @@ public class OOMWarning implements Runnable
 
   public OOMWarning(String string, OutOfMemoryError oomerror)
   {
-    this(string, oomerror, Desktop.desktop);
+    this(string, oomerror, Desktop.getDesktopPane());
   }
 
   @Override
   public void run()
   {
+    oomInprogress = false;
     JvOptionPane.showInternalMessageDialog(desktop, MessageManager
             .formatMessage("warn.out_of_memory_when_action", new String[]
             { action }), MessageManager.getString("label.out_of_memory"),
             JvOptionPane.WARNING_MESSAGE);
     // hope that there's enough memory left that no more appear.
-    oomInprogress = false;
   }
 
 }