git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'origin/develop' into feature/JAL-2587
[jalview.git] / src / jalview / gui / SliderPanel.java
diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index ec53e93..2176719 100755 (executable)
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -365,7 +365,7 @@ public class SliderPanel extends GSliderPanel
     }
     if (forConservation)
     {
-      if (!scheme.conservationApplied())
+      if (!scheme.conservationApplied() && sg != null)
       {
         /*
          * first time the colour scheme has had Conservation shading applied