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:
4a48933
)
JAL-1336 stop example file from launching in plugin
author
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Fri, 28 Jun 2013 16:40:05 +0000
(17:40 +0100)
committer
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Fri, 28 Jun 2013 16:40:05 +0000
(17:40 +0100)
src/jalview/bin/Jalview.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
142b4c3
..
2920e37
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-36,6
+36,7
@@
import java.util.*;
import javax.swing.*;
+import jalview.bin.Cache;
import jalview.gui.*;
import jalview.util.Platform;
@@
-517,7
+518,7
@@
public class Jalview
// And the user
// ////////////////////
if (!headless && file == null && vamsasImport == null
- && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
+ && !Cache.isPlugin() && jalview.bin.Cache.getDefault("SHOW_STARTUP_FILE", true))
{
file = jalview.bin.Cache.getDefault(
"STARTUP_FILE",