--- a/ImageEditor.st	Tue Jul 26 10:51:20 2005 +0200
+++ b/ImageEditor.st	Mon Aug 01 16:04:20 2005 +0200
@@ -4735,14 +4735,12 @@
 doLoadFromFile
     "opens a dialog for loading an image from a file"
 
-    |img file dir filters|
+    |img file filters|
 
     imageSeqNr := nil.
     img := self image.
     img notNil ifTrue: [
         file := img fileName
-    ] ifFalse:[
-        dir := LastDirectory
     ].
 
     filters := FileSelectionBrowser loadImageFileNameFilters.
@@ -4755,7 +4753,7 @@
     ] ifFalse:[
         file := FileSelectionBrowser
                     request:'Load Image From'
-                    inDirectory:dir
+                    inDirectory:LastDirectory
                     withFileFilters:filters.
     ].
     file notNil ifTrue:[
@@ -4918,10 +4916,33 @@
 !
 
 doSaveImageFileAs
-    "opens a dialog for saving current image to a file"
-
-    imageEditView saveImageFileAs.
-    self updateLabelsAndHistory.
+    "opens a dialog for saving an image to a file"
+
+    |img file filters|
+
+    img := self image.
+    img notNil ifTrue: [
+        file := img fileName
+    ].
+
+    filters := FileSelectionBrowser loadImageFileNameFilters.
+
+    file notNil ifTrue:[
+        file := FileSelectionBrowser
+                    request:'Save Image To'
+                    fileName:file
+                    withFileFilters:filters.
+    ] ifFalse:[
+        file := FileSelectionBrowser
+                    request:'Save Image To'
+                    inDirectory:LastDirectory
+                    withFileFilters:filters.
+    ].
+    file notNil ifTrue:[
+        imageEditView saveImageFileAs:file.
+        LastDirectory := file asFilename directoryName.
+        self updateLabelsAndHistory.
+    ]
 !
 
 doSaveImageMaskFileAs