Merge pull request #7850 from mono/pr-anvod-extract-interface

Fixes VSTS 893547: Extract Interface Dialog buttons don't close dialog

1 files changed, 23 insertions, 22 deletions

diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractInterface/ExtractInterfaceOptionService.cs b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractInterface/ExtractInterfaceOptionService.cs
index c12bf94ebe..0a6af9bb24 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractInterface/ExtractInterfaceOptionService.cs
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.ExtractInterface/ExtractInterfaceOptionService.cs
@@ -59,31 +59,32 @@ namespace MonoDevelop.Refactoring.ExtractInterface
 		{
 			await threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync ();
 
-			var dialog = new ExtractInterfaceDialog ();
+			using (var dialog = new ExtractInterfaceDialog ()) {
 
-			dialog.Init (
-				syntaxFactsService,
-				notificationService,
-				extractableMembers,
-				defaultInterfaceName,
-				conflictingTypeNames,
-				defaultNamespace,
-				generatedNameTypeParameterSuffix,
-				languageName);
+				dialog.Init (
+					syntaxFactsService,
+					notificationService,
+					extractableMembers,
+					defaultInterfaceName,
+					conflictingTypeNames,
+					defaultNamespace,
+					generatedNameTypeParameterSuffix,
+					languageName);
 
-			bool performChange = dialog.Run () == Xwt.Command.Ok;
-			if (!performChange)
-				return ExtractInterfaceOptionsResult.Cancelled;
+				bool performChange = dialog.Run () == Xwt.Command.Ok;
+				if (!performChange)
+					return ExtractInterfaceOptionsResult.Cancelled;
 
-			return new ExtractInterfaceOptionsResult (
-				false,
-				dialog.IncludedMembers.AsImmutable (),
-				dialog.InterfaceName,
-				dialog.FileName,
-				dialog.UseSameFile
-					? ExtractInterfaceOptionsResult.ExtractLocation.SameFile
-					: ExtractInterfaceOptionsResult.ExtractLocation.NewFile
-			);
+				return new ExtractInterfaceOptionsResult (
+					false,
+					dialog.IncludedMembers.AsImmutable (),
+					dialog.InterfaceName,
+					dialog.FileName,
+					dialog.UseSameFile
+						? ExtractInterfaceOptionsResult.ExtractLocation.SameFile
+						: ExtractInterfaceOptionsResult.ExtractLocation.NewFile
+				);
+			}
 		}
 	}
 }