--- a/FileOperation.st	Mon Mar 22 23:00:36 2004 +0100
+++ b/FileOperation.st	Mon Mar 22 23:01:08 2004 +0100
@@ -202,7 +202,7 @@
 !FileOperation::Copy class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.45 2004-03-22 19:33:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
 ! !
 
 !FileOperation::Copy methodsFor:'accessing'!
@@ -409,7 +409,7 @@
 !FileOperation::Create class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.45 2004-03-22 19:33:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
 ! !
 
 !FileOperation::Create methodsFor:'accessing'!
@@ -682,7 +682,7 @@
 !FileOperation::Delete class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.45 2004-03-22 19:33:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
 ! !
 
 !FileOperation::Delete methodsFor:'actions'!
@@ -876,7 +876,7 @@
 !FileOperation::Move class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.45 2004-03-22 19:33:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
 ! !
 
 !FileOperation::Move methodsFor:'accessing'!
@@ -964,7 +964,7 @@
 
 moveFiles:aColOfSourceFiles to:aDirectory withOverWriteWarning:overWriteWarning moveFileIfSame:move
 
-    |newFile suffix fileString askResult|
+    |newFile suffix fileString doMove|
 
     (aDirectory exists) ifFalse:[
         Dialog warn:('Cannot move to non-existing directory %1.' bindWith:aDirectory asString allBold).
@@ -978,8 +978,9 @@
     ].
     aColOfSourceFiles do:[: filename |
         newFile := aDirectory construct:filename baseName.
+
+        doMove := true.
         (newFile exists) ifTrue:[
-            askResult := true.
             ((newFile asString = filename asString) and:[move]) ifTrue:[
                 [newFile exists] whileTrue:[
                     suffix := newFile suffix.
@@ -988,8 +989,8 @@
                 ].
             ] ifFalse:[
                 overWriteWarning ifTrue:[
-                    askResult := self fileExistDialogForNewFile:newFile oldFile:filename withCancel:(aColOfSourceFiles size > 1).
-                    askResult isNil ifTrue:[
+                    doMove := self fileExistDialogForNewFile:newFile oldFile:filename withCancel:(aColOfSourceFiles size > 1).
+                    doMove isNil ifTrue:[
                         result := false.
                         ^ self.
                     ]
@@ -997,7 +998,7 @@
             ].
         ].
 
-        askResult ifTrue:[
+        doMove ifTrue:[
             Error handle:[:ex|
                 "was not able to copy it"
                 result := false.
@@ -1046,7 +1047,7 @@
 !FileOperation::Rename class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.45 2004-03-22 19:33:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
 ! !
 
 !FileOperation::Rename methodsFor:'accessing'!
@@ -1152,5 +1153,5 @@
 !FileOperation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.45 2004-03-22 19:33:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.46 2004-03-22 22:01:08 cg Exp $'
 ! !