From 7f7023facc92f28f77bc7b5b2bbd1d04c27ade28 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 17 Aug 2005 09:31:34 +0000
Subject: [PATCH] Return white userColourScheme, not null colourscheme

---
 src/jalview/gui/UserDefinedColours.java |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 0477391..c61db4b 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -336,7 +336,7 @@ public class UserDefinedColours extends GUserDefinedColours
      */
     public static UserColourScheme loadDefaultColours()
     {
-      String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
+        String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
         if ( colours != null)
         {
           if(colours.indexOf("|")>-1)
@@ -346,7 +346,12 @@ public class UserDefinedColours extends GUserDefinedColours
         }
         else
         {
-            return null;
+          Color[] newColours = new Color[24];
+          for (int i = 0; i < 24; i++)
+          {
+            newColours[i] = Color.white;
+          }
+          return new UserColourScheme(newColours);
         }
     }
 
-- 
1.7.10.2