git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'jims/bug/JAL-4298_java_console_causing_hang_at_startup' into develop
[jalview.git]
/
src
/
jalview
/
bin
/
argparser
/
BootstrapArgs.java
diff --git
a/src/jalview/bin/argparser/BootstrapArgs.java
b/src/jalview/bin/argparser/BootstrapArgs.java
index
d32a5b2
..
5c21d03
100644
(file)
--- a/
src/jalview/bin/argparser/BootstrapArgs.java
+++ b/
src/jalview/bin/argparser/BootstrapArgs.java
@@
-214,6
+214,13
@@
public class BootstrapArgs
}
}
}
+
+ // if in an argfile, remove it from the hashset so it can be re-used in
+ // another argfile
+ if (inArgFile != null)
+ {
+ argFiles.remove(inArgFile);
+ }
}
public boolean contains(Arg a)