From: jprocter <Jim Procter>
Date: Fri, 19 Dec 2008 15:36:30 +0000 (+0000)
Subject: catch null pointer exception when no colourscheme is active
X-Git-Tag: Release_2_5~366
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3825c0853b33c036d396bb9e3f8b4d7b4966e5ad;p=jalview.git

catch null pointer exception when no colourscheme is active
---

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index ca1ebf4..83f9d0c 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -373,12 +373,14 @@ public class UserDefinedColours extends GUserDefinedColours implements
       caseSensitiveButtons.addElement(button);
 
       col = Color.white;
-
-      try
-      {
-        col = oldColourScheme.findColour(aa.charAt(0), -1);
-      } catch (Exception ex)
+      if (oldColourScheme!=null)
       {
+        try
+        {
+          col = oldColourScheme.findColour(aa.charAt(0), -1);
+        } catch (Exception ex)
+        {
+        }
       }
     }