Merge pull request #2582 from cwensley/curtis/mac-fix-selectfolderdialog-crash

cwensley · web-flow · commit d612886162b9 · 2023-11-17T13:03:50.000-08:00
Fix a crash that can happen when setting SelectFolderDialog.Directory on Mac
diff --git a/src/Eto.Mac/Forms/SelectFolderDialogHandler.cs b/src/Eto.Mac/Forms/SelectFolderDialogHandler.cs
@@ -32,7 +32,17 @@ public string Title
 		public string Directory
 		{
 			get => Control.Url?.Path ?? Control.DirectoryUrl.Path;
-			set => Control.DirectoryUrl = NSUrl.FromFilename(value);
+			set
+			{
+				try
+				{
+					Control.DirectoryUrl = new NSUrl(value, true);
+				}
+				catch
+				{
+					// ignore errors, can crash depending on the value when [NSUrl initFileURLWithPath:isDirectory:] returns nil
+				}
+			}
 		}
 
 	}

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,17 @@ public string Title`
`32`	`32`	`public string Directory`
`33`	`33`	`{`
`34`	`34`	`get => Control.Url?.Path ?? Control.DirectoryUrl.Path;`
`35`		`- set => Control.DirectoryUrl = NSUrl.FromFilename(value);`
	`35`	`+ set`
	`36`	`+ {`
	`37`	`+ try`
	`38`	`+ {`
	`39`	`+ Control.DirectoryUrl = new NSUrl(value, true);`
	`40`	`+ }`
	`41`	`+ catch`
	`42`	`+ {`
	`43`	`+ // ignore errors, can crash depending on the value when [NSUrl initFileURLWithPath:isDirectory:] returns nil`
	`44`	`+ }`
	`45`	`+ }`
`36`	`46`	`}`
`37`	`47`
`38`	`48`	`}`