diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-17 01:13:10 +0300 |
|---|---|---|
| committer | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2015-06-17 01:13:10 +0300 |
| commit | 4c9ebf6bdd2d5113a3dab2a457a781ab68aae80a (patch) | |
| tree | 76af8de89b1376e8ecb60158aa1c8f3535aaeada /main/src/addins/MonoDevelop.Autotools | |
| parent | a3660b4ee48c7df4ef33a6131db23e68303dfb62 (diff) | |
| parent | 1877f337ee00e0487ca2522ed22893fc87b18b6b (diff) | |
Merge remote-tracking branch 'origin/master' into roslyn
Conflicts:
main/src/addins/CSharpBinding/MonoDevelop.CSharp.ClassOutline/CSharpOutlineTextEditorExtension.cs
main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.Gui/DeployOperations.cs
main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/Fixes/RenameMemberFix.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameItemDialog.cs
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.Rename/RenameRefactoring.cs
main/src/addins/NUnit/Services/NUnitService.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads.ProjectPad/FolderNodeBuilder.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
Diffstat (limited to 'main/src/addins/MonoDevelop.Autotools')
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/Commands.cs | 1 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/main/src/addins/MonoDevelop.Autotools/Commands.cs b/main/src/addins/MonoDevelop.Autotools/Commands.cs index d553c16ac0..556ed2fc07 100644 --- a/main/src/addins/MonoDevelop.Autotools/Commands.cs +++ b/main/src/addins/MonoDevelop.Autotools/Commands.cs @@ -90,6 +90,7 @@ namespace MonoDevelop.Autotools deployer.GenerateFiles (ctx, solution, dialog.DefaultConfiguration, monitor); } finally { dialog.Destroy (); + dialog.Dispose (); if (ctx != null) ctx.Dispose (); if (monitor != null) diff --git a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs index 0ef6aaaf30..cbfea0d795 100644 --- a/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs +++ b/main/src/addins/MonoDevelop.Autotools/TarballBuilderEditorWidget.cs @@ -80,9 +80,10 @@ namespace MonoDevelop.Autotools protected virtual void OnAutofooPropertiesClicked (object sender, System.EventArgs e) { - MakefileSwitchEditor editor = new MakefileSwitchEditor (target); - editor.ShowAll (); - MonoDevelop.Ide.MessageService.ShowCustomDialog (editor, this.Toplevel as Gtk.Window); + using (MakefileSwitchEditor editor = new MakefileSwitchEditor (target)) { + editor.ShowAll (); + MonoDevelop.Ide.MessageService.ShowCustomDialog (editor, this.Toplevel as Gtk.Window); + } } } } |