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 'develop' into features/r2_11_2_alphafold/JAL-629
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
7d226ed
..
449c685
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-273,6
+273,7
@@
public class FileLoader implements Runnable
? "Copied From Clipboard"
: file;
Runtime rt = Runtime.getRuntime();
? "Copied From Clipboard"
: file;
Runtime rt = Runtime.getRuntime();
+
try
{
if (Desktop.instance != null)
try
{
if (Desktop.instance != null)
@@
-380,12
+381,12
@@
public class FileLoader implements Runnable
{
if (selectedFile == null)
{
{
if (selectedFile == null)
{
- al = fa.readFile(file, protocol, format);
+ al = fa.readFile(null, file, protocol, format);
}
else
{
}
else
{
- al = fa.readFile(selectedFile, protocol, format);
+ al = fa.readFile(selectedFile, null, protocol, format);
}
source = fa.getAlignFile(); // keep reference for later if
}
source = fa.getAlignFile(); // keep reference for later if