Merge pull request #1 from buildcomplete/buildcomplete-patch-nitial-directory

buildcomplete · web-flow · commit cc8abbe96cfe · 2019-04-09T16:36:29.000+02:00
Fixed InitialFolder so it now works more than first time its called p…
diff --git a/src/Ookii.Dialogs.Wpf/VistaFileDialog.cs b/src/Ookii.Dialogs.Wpf/VistaFileDialog.cs
@@ -647,7 +647,11 @@ internal virtual void SetDialogProperties(Ookii.Dialogs.Wpf.Interop.IFileDialog
             if( !string.IsNullOrEmpty(_initialDirectory) )
             {
                 Ookii.Dialogs.Wpf.Interop.IShellItem item = NativeMethods.CreateItemFromParsingName(_initialDirectory);
-                dialog.SetDefaultFolder(item);
+                
+                // The dialog.SetDefaultFolder(item) is only set first time the applications sets the folder,
+                // Next time the folder will be restored to last picked object and the 'Default folder' is ignored
+                // Use instead dialog.SetFolder which behaviour better matches the name 'InitialFolder'
+                dialog.SetFolder(item);
             }
 
             if( !string.IsNullOrEmpty(_title) )

Original file line number	Diff line number	Diff line change
`@@ -647,7 +647,11 @@ internal virtual void SetDialogProperties(Ookii.Dialogs.Wpf.Interop.IFileDialog`
`647`	`647`	`if( !string.IsNullOrEmpty(_initialDirectory) )`
`648`	`648`	`{`
`649`	`649`	`Ookii.Dialogs.Wpf.Interop.IShellItem item = NativeMethods.CreateItemFromParsingName(_initialDirectory);`
`650`		`- dialog.SetDefaultFolder(item);`
	`650`	`+`
	`651`	`+ // The dialog.SetDefaultFolder(item) is only set first time the applications sets the folder,`
	`652`	`+ // Next time the folder will be restored to last picked object and the 'Default folder' is ignored`
	`653`	`+ // Use instead dialog.SetFolder which behaviour better matches the name 'InitialFolder'`
	`654`	`+ dialog.SetFolder(item);`
`651`	`655`	`}`
`652`	`656`
`653`	`657`	`if( !string.IsNullOrEmpty(_title) )`