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-2015 JAL-1956 rollout of FeatureColourI in place of
[jalview.git]
/
src
/
jalview
/
io
/
FileLoader.java
diff --git
a/src/jalview/io/FileLoader.java
b/src/jalview/io/FileLoader.java
index
9931f32
..
11c40c3
100755
(executable)
--- a/
src/jalview/io/FileLoader.java
+++ b/
src/jalview/io/FileLoader.java
@@
-388,7
+388,10
@@
public class FileLoader implements Runnable
alignFrame.getViewport().setFeaturesDisplayed(fd);
ColourSchemeI cs = ColourSchemeMapper.getJalviewColourScheme(
colourSchemeName, al);
- alignFrame.changeColour(cs);
+ if (cs != null)
+ {
+ alignFrame.changeColour(cs);
+ }
}
else
{