diff -r 2c90a15a0011 -r 7d01ac3a20e7 ImageEditor.st
--- a/ImageEditor.st	Fri Jul 02 12:04:38 2010 +0200
+++ b/ImageEditor.st	Fri Jul 02 12:06:24 2010 +0200
@@ -5284,12 +5284,13 @@
     aColor isNil ifTrue:[
         idx := nil.
     ] ifFalse:[
-        aColor == Color noColor ifTrue:[
-            ((img := self image) notNil and:[img mask notNil]) ifTrue:[
-                idx := 1.
-            ]
-        ] ifFalse:[
-            (img := self image) notNil ifTrue:[
+        img := self image.
+        img notNil ifTrue: [
+            aColor == Color noColor ifTrue:[
+                (img mask notNil) ifTrue:[
+                    idx := 1.
+                ]
+            ] ifFalse:[
                 (cMap := self listOfColors) notNil ifTrue:[
                     idx := cMap indexOf:aColor ifAbsent:nil.
                 ].
@@ -5309,7 +5310,7 @@
     ].
     self selectionOfColor value:idx.
 
-    "Modified: / 02-07-2010 / 11:46:25 / cg"
+    "Modified: / 02-07-2010 / 12:06:07 / cg"
 !
 
 selectedColorIndexOrNil