From 14d1b87b4738f1e885e8e55de22d8659d0d719f0 Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Wed, 22 Aug 2007 13:32:51 +0000
Subject: [PATCH] fix serious repetitive exceptions if user closes colour
 dialog box without selecting colour

---
 src/jalview/gui/TreeCanvas.java |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index ea2ef4d..328f02a 100755
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -682,8 +682,10 @@ public class TreeCanvas
       {
         Color col = JColorChooser.showDialog(this, "Select Sub-Tree Colour",
                                              highlightNode.color);
-
-        setColor(highlightNode, col);
+        if (col!=null)
+        {
+          setColor(highlightNode, col);
+        }
       }
       else
       if (evt.getClickCount() > 1)
-- 
1.7.10.2