X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frenderer%2FResidueShader.java;h=c0311700f1e61e5afc93c16984a6d8b98f14d5c5;hb=fb06722c6787ed41809827a0ddfb9cc6e9c7324d;hp=aa84816a83108d0c89aa859acd7ae8e3a214c944;hpb=991d2210e8e086bde29a90bdf21979261442d889;p=jalview.git

diff --git a/src/jalview/renderer/ResidueShader.java b/src/jalview/renderer/ResidueShader.java
index aa84816..c031170 100644
--- a/src/jalview/renderer/ResidueShader.java
+++ b/src/jalview/renderer/ResidueShader.java
@@ -235,6 +235,11 @@ public class ResidueShader implements ResidueShaderI
   @Override
   public Color findColour(char symbol, int position, SequenceI seq)
   {
+    if (colourScheme == null)
+    {
+      return Color.white; // Colour is 'None'
+    }
+
     /*
      * get 'base' colour
      */
@@ -243,9 +248,8 @@ public class ResidueShader implements ResidueShaderI
             : profile.getModalResidue();
     float pid = profile == null ? 0f
             : profile.getPercentageIdentity(ignoreGaps);
-    Color colour = colourScheme == null ? Color.white
-            : colourScheme.findColour(symbol, position, seq, modalResidue,
-                    pid);
+    Color colour = colourScheme.findColour(symbol, position, seq,
+            modalResidue, pid);
 
     /*
      * apply PID threshold and consensus fading if in force