From 73522f02bc614929defe2a61bd1c0787fb747fa7 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Fri, 11 Aug 2006 08:39:21 +0000 Subject: [PATCH] Desktop is null if -noDisplay is set --- src/jalview/io/FileLoader.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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(); } } -- 1.7.10.2