From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Wed, 21 Dec 2016 14:49:19 +0000 (+0000)
Subject: JAL-2360 fix incorrect action on Cancel user defined colour for group
X-Git-Tag: Release_2_10_3b1~357^2~41
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3f719e5608ad146997cfa48b5f7005137fb2d1a6;p=jalview.git

JAL-2360 fix incorrect action on Cancel user defined colour for group
---

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);
     }