From 3f719e5608ad146997cfa48b5f7005137fb2d1a6 Mon Sep 17 00:00:00 2001
From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 21 Dec 2016 14:49:19 +0000
Subject: [PATCH] JAL-2360 fix incorrect action on Cancel user defined colour
 for group

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

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index bb2676c..cfc464e 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -939,10 +939,9 @@ public class UserDefinedColours extends GUserDefinedColours implements
   }
 
   /**
-   * DOCUMENT ME!
+   * On cancel, restores the colour scheme before the dialogue was opened
    * 
    * @param e
-   *          DOCUMENT ME!
    */
   @Override
   protected void cancelButton_actionPerformed(ActionEvent e)
@@ -955,9 +954,8 @@ public class UserDefinedColours extends GUserDefinedColours implements
       }
       else
       {
-        ap.av.setGlobalColourScheme(oldColourScheme);
+        ap.alignFrame.changeColour(oldColourScheme);
       }
-      ap.alignFrame.changeColour(oldColourScheme);
       ap.paintAlignment(true);
     }
 
-- 
1.7.10.2