usercolours changed

[jalview.git] / src / jalview / gui / AlignViewport.java

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 82d2e3e..7256bed 100755 (executable)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -100,6 +100,8 @@ public class AlignViewport
     if(Preferences.defaultColour!=null)\r
     {\r
       globalColourScheme = ColourSchemeProperty.getColour(alignment, Preferences.defaultColour);\r
+      if(globalColourScheme instanceof UserColourScheme)\r
+       globalColourScheme = UserDefinedColours.loadDefaultColours();\r
       if(globalColourScheme!=null)\r
         globalColourScheme.setConsensus( vconsensus );\r
    }\r
@@ -479,14 +481,10 @@ public class AlignViewport
   }\r
 \r
   public boolean getShowAnnotation()\r
-  {\r
-    return showAnnotation;\r
-  }\r
+  {   return showAnnotation;  }\r
 \r
   public void setShowAnnotation(boolean b)\r
-  {\r
-    showAnnotation = b;\r
-  }\r
+  {    showAnnotation = b;  }\r
 \r
   public boolean getScaleAboveWrapped()\r
   { return scaleAboveWrapped;}\r