Merge branch 'merge/develop_JAL-1780_JAL-653_JAL-1892' into develop

[jalview.git] / src / jalview / io / FileLoader.java

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 0cd2987..7387fa2 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -406,7 +406,9 @@ public class FileLoader implements Runnable
 
           final String errorMessage = "Couldn't load file " + title + "\n"
                   + error;
-          if (raiseGUI)
+          // TODO: refactor FileLoader to be independent of Desktop / Applet GUI
+          // bits ?
+          if (raiseGUI && Desktop.desktop != null)
           {
             javax.swing.SwingUtilities.invokeLater(new Runnable()
             {