From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 11 Aug 2006 08:39:21 +0000 (+0000)
Subject: Desktop is null if -noDisplay is set
X-Git-Tag: Release_2_1~106
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=73522f02bc614929defe2a61bd1c0787fb747fa7;p=jalview.git

Desktop is null if -noDisplay is set
---

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index 77f2a79..0fc4aa8 100755
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -125,7 +125,8 @@ public class FileLoader
 
     public void run()
     {
-      Desktop.instance.startLoading(file);
+      if (Desktop.instance != null)
+        Desktop.instance.startLoading(file);
 
       SequenceI[] sequences = null;
 
@@ -178,7 +179,8 @@ public class FileLoader
         }
         else
         {
-          Desktop.instance.stopLoading();
+          if (Desktop.instance != null)
+            Desktop.instance.stopLoading();
 
           JOptionPane.showInternalMessageDialog(Desktop.desktop,
                                                 "Couldn't load file " + file +
@@ -194,7 +196,8 @@ public class FileLoader
         updateRecentlyOpened();
       }
 
-      Desktop.instance.stopLoading();
+      if (Desktop.instance != null)
+        Desktop.instance.stopLoading();
 
     }
   }