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
JAL-2489 bug fix
[jalview.git]
/
src
/
jalview
/
io
/
JSONFile.java
diff --git
a/src/jalview/io/JSONFile.java
b/src/jalview/io/JSONFile.java
index
053a65e
..
583bbc0
100644
(file)
--- a/
src/jalview/io/JSONFile.java
+++ b/
src/jalview/io/JSONFile.java
@@
-767,7
+767,8
@@
public class JSONFile extends AlignFile implements ComplexAlignFile
}
}
}
}
}
}
- globalColourScheme = viewport.getGlobalColourScheme().getSchemeName();
+ globalColourScheme = (viewport.getGlobalColourScheme() == null) ? ResidueColourScheme.NONE
+ : viewport.getGlobalColourScheme().getSchemeName();
setDisplayedFeatures(viewport.getFeaturesDisplayed());
showSeqFeatures = viewport.isShowSequenceFeatures();
setDisplayedFeatures(viewport.getFeaturesDisplayed());
showSeqFeatures = viewport.isShowSequenceFeatures();