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
/
project
/
Jalview2XML.java
diff --git
a/src/jalview/project/Jalview2XML.java
b/src/jalview/project/Jalview2XML.java
index
af3b2c8
..
cc20fce
100644
(file)
--- a/
src/jalview/project/Jalview2XML.java
+++ b/
src/jalview/project/Jalview2XML.java
@@
-631,7
+631,7
@@
public class Jalview2XML
*/
public void saveState(JarOutputStream jout)
{
*/
public void saveState(JarOutputStream jout)
{
- AlignFrame[] frames = Desktop.getAlignFrames();
+ AlignFrame[] frames = Desktop.getDesktopAlignFrames();
setStateSavedUpToDate(true);
setStateSavedUpToDate(true);
@@
-6919,7
+6919,7
@@
public class Jalview2XML
if (stateSavedUpToDate()) // nothing happened since last project save
return true;
if (stateSavedUpToDate()) // nothing happened since last project save
return true;
- AlignFrame[] frames = Desktop.getAlignFrames();
+ AlignFrame[] frames = Desktop.getDesktopAlignFrames();
if (frames != null)
{
for (int i = 0; i < frames.length; i++)
if (frames != null)
{
for (int i = 0; i < frames.length; i++)