Author: mhutch
Date: 2008-02-12 13:09:46 -0500 (Tue, 12 Feb 2008)
New Revision: 95538
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
Log:
* MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs: Dispose
options dialog when done with it. Fixes "Bug 358361 - Have to hit
esc twice to close the file/new file dialog".
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-12
18:08:21 UTC (rev 95537)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Ide/ChangeLog 2008-02-12
18:09:46 UTC (rev 95538)
@@ -1,3 +1,9 @@
+2008-02-12 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/ProjectOperations.cs: Dispose options dialog when
done
+ with it. Fixes "Bug 358361 - Have to hit esc twice to close the
file/new
+ file dialog".
+
2008-02-08 Mike Krüger <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Dom.Output/Ambience.cs,
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2008-02-12 18:08:21 UTC (rev 95537)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProjectOperations.cs
2008-02-12 18:09:46 UTC (rev 95538)
@@ -667,13 +667,14 @@
ExtensionNode generalOptionsNode =
AddinManager.GetExtensionNode
("/MonoDevelop/ProjectModel/Gui/ProjectOptions/GeneralOptions");
ExtensionNode configurationPropertiesNode =
AddinManager.GetExtensionNode
("/MonoDevelop/ProjectModel/Gui/ProjectOptions/ConfigurationOptions");
- ProjectOptionsDialog optionsDialog = new
ProjectOptionsDialog (IdeApp.Workbench.RootWindow, selectedProject,
generalOptionsNode, configurationPropertiesNode);
- if (panelId != null)
- optionsDialog.SelectPanel (panelId);
+ using (ProjectOptionsDialog optionsDialog = new
ProjectOptionsDialog (IdeApp.Workbench.RootWindow, selectedProject,
generalOptionsNode, configurationPropertiesNode)) {
+ if (panelId != null)
+ optionsDialog.SelectPanel
(panelId);
- if (optionsDialog.Run() ==
(int)Gtk.ResponseType.Ok) {
- selectedProject.NeedsBuilding = true;
- SaveProject (selectedProject);
+ if (optionsDialog.Run() ==
(int)Gtk.ResponseType.Ok) {
+ selectedProject.NeedsBuilding =
true;
+ SaveProject (selectedProject);
+ }
}
} else if (entry is Combine) {
Combine combine = (Combine) entry;
@@ -681,11 +682,12 @@
ExtensionNode generalOptionsNode =
AddinManager.GetExtensionNode
("/MonoDevelop/ProjectModel/Gui/CombineOptions/GeneralOptions");
ExtensionNode configurationPropertiesNode =
AddinManager.GetExtensionNode
("/MonoDevelop/ProjectModel/Gui/CombineOptions/ConfigurationOptions");
- CombineOptionsDialog optionsDialog = new
CombineOptionsDialog (IdeApp.Workbench.RootWindow, combine, generalOptionsNode,
configurationPropertiesNode);
- if (panelId != null)
- optionsDialog.SelectPanel (panelId);
- if (optionsDialog.Run () == (int)
Gtk.ResponseType.Ok)
- SaveCombine ();
+ using (CombineOptionsDialog optionsDialog = new
CombineOptionsDialog (IdeApp.Workbench.RootWindow, combine, generalOptionsNode,
configurationPropertiesNode)) {
+ if (panelId != null)
+ optionsDialog.SelectPanel
(panelId);
+ if (optionsDialog.Run () == (int)
Gtk.ResponseType.Ok)
+ SaveCombine ();
+ }
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
