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.Gettext/MonoDevelop.Gettext.NodeBuilders | |
| 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.Gettext/MonoDevelop.Gettext.NodeBuilders')
| -rw-r--r-- | main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs index d0fbe6ce3e..040f2037c4 100644 --- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs +++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.NodeBuilders/TranslationProjectNodeBuilder.cs @@ -122,7 +122,9 @@ namespace MonoDevelop.Gettext.NodeBuilders TranslationProject project = CurrentNode.DataItem as TranslationProject; if (project == null) return; - MessageService.ShowCustomDialog (new TranslationProjectOptionsDialog (project)); + + using (var dlg = new TranslationProjectOptionsDialog (project)) + MessageService.ShowCustomDialog (dlg); IdeApp.Workspace.SaveAsync (); } @@ -153,6 +155,7 @@ namespace MonoDevelop.Gettext.NodeBuilders } finally { chooser.Destroy (); + chooser.Dispose (); } } static Task currentUpdateTranslationOperation = Task.FromResult (0); |