#BUGFIX by exept
authorClaus Gittinger <cg@exept.de>
Sat, 27 Jul 2019 12:07:17 +0200
changeset 3740 6b1e0eefb50a
parent 3739 9c7040099cfe
child 3741 373454460851
#BUGFIX by exept class: ImageEditor changed: #changeHLS
ImageEditor.st
--- a/ImageEditor.st	Thu Jul 25 11:49:10 2019 +0200
+++ b/ImageEditor.st	Sat Jul 27 12:07:17 2019 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1997-1998 by eXept Software AG
               All Rights Reserved
@@ -5811,8 +5809,8 @@
         resourceSelector notNil ifTrue:[
             ^ resources 
                     string:(self modified 
-                            ifTrue:['ImageEditor (modified): %1 » %2']
-                            ifFalse:['ImageEditor: %1 » %2'])
+                            ifTrue:['ImageEditor (modified): %1 » %2']
+                            ifFalse:['ImageEditor: %1 » %2'])
                     with:resourceClass name
                     with:resourceSelector
         ].
@@ -5845,8 +5843,8 @@
         resourceSelector notNil ifTrue:[
             ^ resources 
                     string:(self modified 
-                            ifTrue:['Image (modified) from: %1 » %2']
-                            ifFalse:['Image from: %1 » %2'])
+                            ifTrue:['Image (modified) from: %1 » %2']
+                            ifFalse:['Image from: %1 » %2'])
                     with:resourceClass name
                     with:resourceSelector
         ].
@@ -6673,7 +6671,9 @@
         [
             |hShift lFactor sFactor|
 
-            acceptChannel value:true.
+            "/ commented, because this leads to a recursion error
+            "/ (holders accept - send shiftAction again - ...)
+            "/ acceptChannel value:true.
 
             firstChange ifTrue:[
                 imageEditView makeUndo.
@@ -6732,13 +6732,15 @@
     bindings at:#resetHueShift put:[hueShiftHolder value:0].
     bindings at:#resetLightFactor put:[lightFactorHolder value:1.0].
     bindings at:#resetSaturationFactor put:[saturationFactorHolder value:1.0].
-    
+
+    [
     (self openDialogInterface:#changeHLSDialogSpec withBindings:bindings) 
     ifFalse:[ 
         anyChange ifTrue:[
             imageEditView undo
         ]
     ].
+    ] ensure:[self halt].
 
     (p := shiftProcess) notNil ifTrue:[
         p waitUntilTerminated.