From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 2 Jun 2005 11:02:59 +0000 (+0000)
Subject: Check startup file is not null
X-Git-Tag: Release_2_0~125
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=dd4cc875a15a345a7245083fba46ce6013d8cff9;p=jalview.git

Check startup file is not null
---

diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java
index ffa844a..88e6236 100755
--- a/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@ -121,7 +121,8 @@ public class Jalview extends JApplet
          frame.LoadFile(file, protocol, format);
      }
 
-     if(jalview.gui.Preferences.showStartupFile)
+     if(jalview.gui.Preferences.showStartupFile &&
+         jalview.gui.Preferences.startupFile!=null)
      {
        String file = jalview.gui.Preferences.startupFile;
        String protocol = "File";