FileDialog.st
changeset 6953 651025031ea2
parent 6728 d8d0d68ea5d5
child 7567 9896e794a220
--- a/FileDialog.st	Wed Aug 23 12:34:29 2006 +0200
+++ b/FileDialog.st	Wed Aug 23 12:35:33 2006 +0200
@@ -572,7 +572,8 @@
     and:[initialDefaultFileName isAbsolute 
     and:[true "initialDefaultFileName asFilename exists"]]) ifTrue:[
         defaultDir := initialDefaultFileName asAbsoluteFilename.
-        viewFiles ifTrue:[
+        true "viewFiles" ifTrue:[
+            defaultFile := defaultDir asAbsoluteFilename.
             defaultDir := defaultDir directory.
         ].
     ] ifFalse:[
@@ -591,16 +592,17 @@
 "/        defaultDir := defaultDir directory.
 "/    ].
 
-    viewFiles ifFalse:[
-        defaultFile := defaultDir asAbsoluteFilename.
-    ] ifTrue:[
-        (initialDefaultFileName notNil and:[initialDefaultFileName withoutSuffix baseName ~= '*']) ifTrue:[
-            defaultFile := defaultDir construct:initialDefaultFileName baseName.
+    defaultFile isNil ifTrue:[
+        viewFiles ifFalse:[
+            defaultFile := defaultDir asAbsoluteFilename.
+        ] ifTrue:[
+            (initialDefaultFileName notNil and:[initialDefaultFileName withoutSuffix baseName ~= '*']) ifTrue:[
+                defaultFile := defaultDir construct:initialDefaultFileName baseName.
+            ] ifFalse:[
+                defaultFile := defaultDir.
+            ].
         ].
     ].
-    defaultFile isNil ifTrue:[
-        defaultFile := defaultDir.
-    ].
 
     instance := self new.
     defaultDir notNil ifTrue:[instance directory:defaultDir].
@@ -621,6 +623,8 @@
 
     instance openWindowModal.
     ^ instance
+
+    "Modified: / 23-08-2006 / 12:24:54 / cg"
 ! !
 
 !FileDialog class methodsFor:'accessing'!
@@ -1646,5 +1650,5 @@
 !FileDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.89 2006-03-21 19:57:54 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.90 2006-08-23 10:35:33 cg Exp $'
 ! !