X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=ec4ad5526196ea40068f3f33e2ae59039709102b;hb=a0d1b1826f8ab0792c589946746d52ad0316fc99;hp=2182b2cb3f9d962bded79eb9d04b3b6f92ba4dac;hpb=92c253b4b037e45afffeb1e34f89d0b825ba3225;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 2182b2c..ec4ad55 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -139,8 +139,12 @@ public class UserDefinedColours extends GUserDefinedColours
 
       if(e.isShiftDown())
       {
-        JButton start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);
-        JButton end = (JButton) e.getSource();
+        JButton start, end = (JButton) e.getSource();
+        if(selectedButtons.size()>1)
+          start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);
+        else
+          start = (JButton) e.getSource();
+
         int startIndex=0, endIndex=0;
         for(int b=0; b<buttonPanel.getComponentCount(); b++)
         {
@@ -551,7 +555,11 @@ public class UserDefinedColours extends GUserDefinedColours
       }
       if (!files.equals(coloursFound.toString()))
       {
-        jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());
+        if (coloursFound.toString().length() > 1)
+          jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
+                                        coloursFound.toString());
+        else
+          jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
       }
     }
 
@@ -587,7 +595,10 @@ public class UserDefinedColours extends GUserDefinedColours
         }
       }
 
-      jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());
+      if (coloursFound.toString().length() > 1)
+        jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());
+      else
+        jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
 
     }
 }