--- a/ImageEditor.st	Mon Oct 18 14:22:22 2010 +0200
+++ b/ImageEditor.st	Mon Oct 18 14:25:30 2010 +0200
@@ -6219,16 +6219,30 @@
 
     filters := FileSelectionBrowser saveImageFileNameFilters.
 
-    file notNil ifTrue:[
-        file := FileSelectionBrowser
-                    request:'Save Image To'
-                    fileName:file
-                    withFileFilters:filters.
+    (FileSelectionBrowser isNil or:[DirectoryView isNil]) ifTrue:[
+        file notNil ifTrue:[
+            file := Dialog requestFileName:'Save Image To'
+                        default:file
+                        pattern:(filters first).
+        ] ifFalse:[
+            file := Dialog
+                        requestFileName:'Save Image To'
+                        default:'image.png'
+                        pattern:(filters first)
+                        fromDirectory:LastDirectory.
+        ].
     ] ifFalse:[
-        file := FileSelectionBrowser
-                    request:'Save Image To'
-                    inDirectory:LastDirectory
-                    withFileFilters:filters.
+        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.
@@ -6236,6 +6250,8 @@
         self updateLabelsAndHistory.
         self clearModified.
     ]
+
+    "Modified: / 18-10-2010 / 14:25:17 / cg"
 !
 
 doSaveImageMaskFileAs