From: Jim Procter <jprocter@dundee.ac.uk>
Date: Thu, 19 Feb 2015 14:57:01 +0000 (+0000)
Subject: JAL-653 JAL-966 TODO and avoid NPE when desktop instance unavailable
X-Git-Tag: Release_2_10_0~296^2~169
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=c0844527e938d3d692603e2586d873e6efeeb87d

JAL-653 JAL-966 TODO and avoid NPE when desktop instance unavailable
---

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 6329f58..aa76da5 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -384,7 +384,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()
             {