--- a/ImageEditor.st	Wed Jun 16 16:05:21 2010 +0200
+++ b/ImageEditor.st	Fri Jul 02 12:04:38 2010 +0200
@@ -5285,7 +5285,7 @@
         idx := nil.
     ] ifFalse:[
         aColor == Color noColor ifTrue:[
-            img mask notNil ifTrue:[
+            ((img := self image) notNil and:[img mask notNil]) ifTrue:[
                 idx := 1.
             ]
         ] ifFalse:[
@@ -5308,6 +5308,8 @@
         ].
     ].
     self selectionOfColor value:idx.
+
+    "Modified: / 02-07-2010 / 11:46:25 / cg"
 !
 
 selectedColorIndexOrNil