Merge pull request #9232 from mono/backport-pr-9231-to-release-8.3

[release-8.3] Always assign a CancellationTokenSource

Author: sevoku

main/src/addins/MacPlatform/Dialogs/MacOpenFileDialogHandler.cs

@@ -72,7 +72,7 @@ protected override NSSavePanel OnCreatePanel (OpenFileDialogData data)
 
 		public bool Run (OpenFileDialogData data)
 		{
-			var panelClosedSource = MacSystemInformation.OsVersion < MacSystemInformation.Catalina ? new CancellationTokenSource () : null;
+			using var panelClosedSource = new CancellationTokenSource ();
 			try {
 				using (var panel = CreatePanel (data, out var state)) {
 					bool pathAlreadySet = false;
@@ -118,11 +118,11 @@ public bool Run (OpenFileDialogData data)
 
 					// TODO: support for data.CenterToParent, we could use sheeting.
 					if (panel.RunModal () == 0 && !pathAlreadySet) {
-						panelClosedSource?.Cancel ();
+						panelClosedSource.Cancel ();
 						IdeServices.DesktopService.FocusWindow (parent);
 						return false;
 					}
-					panelClosedSource?.Cancel ();
+					panelClosedSource.Cancel ();
 					if (!pathAlreadySet)
 						data.SelectedFiles = MacSelectFileDialogHandler.GetSelectedFiles (panel);
 
@@ -140,8 +140,6 @@ public bool Run (OpenFileDialogData data)
 				}
 			} catch (Exception ex) {
 				LoggingService.LogInternalError ("Error in Open File dialog", ex);
-			} finally {
-				panelClosedSource?.Dispose ();
 			}
 			return true;
 		}