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 (executable)
--- 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
    * 
    * @param e

-   *          DOCUMENT ME!

    */
   @Override
   protected void cancelButton_actionPerformed(ActionEvent e)
    */
   @Override
   protected void cancelButton_actionPerformed(ActionEvent e)

@@ -955,9 +954,8 @@ public class UserDefinedColours extends GUserDefinedColours implements
       }
       else
       {
       }
       else
       {

-        ap.av.setGlobalColourScheme(oldColourScheme);
+        ap.alignFrame.changeColour(oldColourScheme);

       }
       }

-      ap.alignFrame.changeColour(oldColourScheme);

       ap.paintAlignment(true);
     }
 
       ap.paintAlignment(true);
     }