From a35ccec335158616a10026952e0cefad8083fe62 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Fri, 27 May 2005 09:33:12 +0000
Subject: [PATCH] Check if usrCol is null

---
 src/jalview/gui/AlignViewport.java |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index a5fd31f..fe03a31 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -101,7 +101,9 @@ public class AlignViewport
     {
       globalColourScheme = ColourSchemeProperty.getColour(alignment, Preferences.defaultColour);
       if(globalColourScheme instanceof UserColourScheme)
-       globalColourScheme = UserDefinedColours.loadDefaultColours();
+      {
+        globalColourScheme = UserDefinedColours.loadDefaultColours();
+      }
       if(globalColourScheme!=null)
         globalColourScheme.setConsensus( vconsensus );
    }
-- 
1.7.10.2