git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e25a1b7
)
Check startup file is not null
author
amwaterhouse
<Andrew Waterhouse>
Thu, 2 Jun 2005 11:02:59 +0000
(11:02 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Thu, 2 Jun 2005 11:02:59 +0000
(11:02 +0000)
src/jalview/bin/Jalview.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
ffa844a
..
88e6236
100755
(executable)
--- 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);
\r
}
\r
\r
- if(jalview.gui.Preferences.showStartupFile)
\r
+ if(jalview.gui.Preferences.showStartupFile &&
\r
+ jalview.gui.Preferences.startupFile!=null)
\r
{
\r
String file = jalview.gui.Preferences.startupFile;
\r
String protocol = "File";
\r