diff options
| author | Vincent Dondain <vincent.dondain@xamarin.com> | 2015-07-01 13:20:43 +0300 |
|---|---|---|
| committer | Vincent Dondain <vincent.dondain@xamarin.com> | 2015-07-01 13:20:43 +0300 |
| commit | 3094d8befb225e7486c486b14d8ba897a15343ee (patch) | |
| tree | 9000720f9fba41a09bb40bebfe9024e21bf13d36 /main/src/addins/Deployment/MonoDevelop.Deployment | |
| parent | 3b9040bb1015f766696fcbbfa91d0e8ffed07290 (diff) | |
| parent | 3e626acf4958d4b410f6f4bda09bc0c70a0cb9f0 (diff) | |
Merge branch 'master' into templates-update-master
Diffstat (limited to 'main/src/addins/Deployment/MonoDevelop.Deployment')
4 files changed, 10 insertions, 6 deletions
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs index 9096ae8463..0664524e34 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Commands/Commands.cs @@ -45,6 +45,7 @@ namespace MonoDevelop.Deployment } } finally { dlg.Destroy (); + dlg.Dispose (); } } @@ -67,6 +68,7 @@ namespace MonoDevelop.Deployment } } finally { dlg.Destroy (); + dlg.Dispose (); } } diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs index 1f877eef1d..be535a78bc 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs @@ -17,6 +17,7 @@ namespace MonoDevelop.Deployment.Gui DeployService.Install (mon, entry, dlg.Prefix, dlg.AppName, configuration); } finally { dlg.Destroy (); + dlg.Dispose (); } } } @@ -57,9 +58,10 @@ namespace MonoDevelop.Deployment.Gui public static void ShowPackageSettings (Package package) { - EditPackageDialog dlg = new EditPackageDialog (package); - if (MessageService.ShowCustomDialog (dlg) == (int) Gtk.ResponseType.Ok) - IdeApp.ProjectOperations.Save (package.ParentProject); + using (EditPackageDialog dlg = new EditPackageDialog (package)) { + if (MessageService.ShowCustomDialog (dlg) == (int)Gtk.ResponseType.Ok) + IdeApp.ProjectOperations.Save (package.ParentProject); + } } } } diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs index 009cb2e770..3d9f2fda4e 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DialogFileReplacePolicy.cs @@ -59,8 +59,8 @@ namespace MonoDevelop.Deployment.Gui //IFileReplacePolicy is not likely to be running in the GUI thread //so use some DispatchService magic to synchronously call the dialog in the GUI thread DispatchService.GuiSyncDispatch (delegate { - var dialog = new FileReplaceDialog (response, source, sourceModified.ToString (), target, targetModified.ToString ()); - response = (FileReplaceDialog.ReplaceResponse) MessageService.ShowCustomDialog (dialog); + using (var dialog = new FileReplaceDialog (response, source, sourceModified.ToString (), target, targetModified.ToString ())) + response = (FileReplaceDialog.ReplaceResponse) MessageService.ShowCustomDialog (dialog); }); switch (response) { diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/FileReplaceDialog.cs b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/FileReplaceDialog.cs index 3b5c7f49d3..b2f78bc3cb 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/FileReplaceDialog.cs +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/FileReplaceDialog.cs @@ -73,7 +73,7 @@ namespace MonoDevelop.Deployment break; } - if (response == ReplaceResponse.ReplaceOlderAll || response == ReplaceResponse.ReplaceOlderAll || response == ReplaceResponse.SkipAll) + if (response == ReplaceResponse.ReplaceOlderAll || response == ReplaceResponse.SkipAll) applyAll.Active = true; } |