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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into Jalview-JS/20190123
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
144cdd0
..
f1b8025
100644
(file)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-1748,7
+1748,7
@@
public class Desktop extends jalview.jbgui.GDesktop
{
File selectedFile = chooser.getSelectedFile();
setProjectFile(selectedFile);
{
File selectedFile = chooser.getSelectedFile();
setProjectFile(selectedFile);
- final String choice = selectedFile.getAbsolutePath();
+ String choice = selectedFile.getAbsolutePath();
Cache.setProperty("LAST_DIRECTORY", selectedFile.getParent());
new Thread(new Runnable()
{
Cache.setProperty("LAST_DIRECTORY", selectedFile.getParent());
new Thread(new Runnable()
{
@@
-1762,7
+1762,7
@@
public class Desktop extends jalview.jbgui.GDesktop
}
else
{
}
else
{
- new jalview.project.Jalview2XML().loadJalviewAlign(choice);
+ new jalview.project.Jalview2XML().loadJalviewAlign(selectedFile);
}
} catch (OutOfMemoryError oom)
{
}
} catch (OutOfMemoryError oom)
{