X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTreeCanvas.java;h=f0d63c4dcb6fbdeda12cb91d269712b8cb750c34;hb=ef23c17739a6fba3a8d455b725782bce4607ac9f;hp=d05aee1878666314d7f9b094332330d4d3ef97ae;hpb=9fff97021c2c637e426f6971d54dcf3fd4191985;p=jalview.git

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index d05aee1..f0d63c4 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -715,21 +715,19 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
 
                     if (sg.cs != null)
                     {
-                        ((ResidueColourScheme) sg.cs).setThreshold(25, av.getIgnoreGapsConsensus());
+                        sg.cs.setThreshold(25, av.getIgnoreGapsConsensus());
                     }
 
-                    if (av.getGlobalColourScheme() instanceof ConservationColourScheme)
+                    if (  av.getGlobalColourScheme()!=null
+                       && av.getGlobalColourScheme().conservationApplied())
                     {
-                        ConservationColourScheme ccs = (ConservationColourScheme) av.getGlobalColourScheme();
                         Conservation c = new Conservation("Group",
                                 ResidueProperties.propHash, 3, sg.sequences,
                                 sg.getStartRes(), sg.getEndRes());
 
                         c.calculate();
                         c.verdict(false, av.ConsPercGaps);
-                        ccs = new ConservationColourScheme(c, ccs.cs);
-
-                        sg.cs = ccs;
+                        sg.cs.setConservation(c);
                     }
 
                     av.alignment.addGroup(sg);