--- a/FileOperation.st	Mon Dec 13 14:10:20 2004 +0100
+++ b/FileOperation.st	Mon Dec 13 23:09:01 2004 +0100
@@ -1274,10 +1274,10 @@
     aColOfFiles do:[:oldFile |
         oldName := oldFile baseName asString.
         lastNewName notNil ifTrue:[
-            initialText := FileBrowser goodRenameDefaultForFile:oldName lastOld:lastOldName lastNew:lastNewName
+            initialText := FileBrowser goodRenameDefaultForFile:oldName lastOld:lastOldName lastNew:lastNewName.
         ].
         doRename := false.
-        renameAll ifTrue:[
+        (renameAll and:[initialText notNil]) ifTrue:[
             doRename := true.
             newName := initialText.
         ] ifFalse:[
@@ -1285,6 +1285,7 @@
             queryBox initialText:(initialText ? oldName).
             queryBox action:[:newEnteredName | newName := newEnteredName. doRename := true.].
             queryBox show "showAtPointer".
+            queryBox accepted ifFalse:[self halt].
         ].
         doRename ifTrue:[
             (self renameFile:oldFile to:newName asString) ifTrue:[
@@ -1299,5 +1300,5 @@
 !FileOperation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.62 2004-12-13 13:10:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileOperation.st,v 1.63 2004-12-13 22:09:01 cg Exp $'
 ! !