[Monodevelop-patches-list] r2226 - in trunk/MonoDevelop/Core/src/MonoDevelop.Base: . Gui/Dialogs/CombineConfiguration

[commit-watcher at mono-cvs.ximian.com]

Author: lluis
Date: 2005-02-02 16:01:40 -0500 (Wed, 02 Feb 2005)
New Revision: 2226

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
Log:
2005-02-02  Lluis Sanchez Gual  <lluis at novell.com>

	* Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs: 
	Fix nullref exception when saving. 'store' wasn't being set.



Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-02-02 20:20:20 UTC (rev 2225)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-02-02 21:01:40 UTC (rev 2226)
@@ -1,3 +1,8 @@
+2005-02-02  Lluis Sanchez Gual  <lluis at novell.com>
+
+	* Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs: 
+	Fix nullref exception when saving. 'store' wasn't being set.
+
 2005-02-02  John Luke  <john.luke at gmail.com>
 
 	* Commands/MenuItemBuilders.cs: only use RecentItem.Private

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs	2005-02-02 20:20:20 UTC (rev 2225)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/Gui/Dialogs/CombineConfiguration/CombineStartupPanel.cs	2005-02-02 21:01:40 UTC (rev 2226)
@@ -52,26 +52,26 @@
 				//singleRadioButton.Clicked += new EventHandler(OptionsChanged);
 
 				// Setting up OptionMenus
-				ListStore store = new ListStore (typeof (string));
+				ListStore tmpStore = new ListStore (typeof (string));
 				int active = -1;
 				for (int i = 0;  i < combine.Entries.Count; i++)  {
 					CombineEntry entry = (CombineEntry) combine.Entries[i];
-					store.AppendValues (entry.Name);
+					tmpStore.AppendValues (entry.Name);
 
 					if (combine.SingleStartProjectName == entry.Name)
 						active = i;
 				}
-				singleCombo.Model = store;
+				singleCombo.Model = tmpStore;
 
 				CellRendererText cr = new CellRendererText ();
 				singleCombo.PackStart (cr, true);
 				singleCombo.AddAttribute (cr, "text", 0);
 				singleCombo.Active = active;
 
-				store = new ListStore (typeof (string));
-				store.AppendValues (GettextCatalog.GetString ("None"));
-				store.AppendValues (GettextCatalog.GetString ("Execute"));
-				actionCombo.Model = store;
+				tmpStore = new ListStore (typeof (string));
+				tmpStore.AppendValues (GettextCatalog.GetString ("None"));
+				tmpStore.AppendValues (GettextCatalog.GetString ("Execute"));
+				actionCombo.Model = tmpStore;
 				actionCombo.PackStart (cr, true);
 				actionCombo.AddAttribute (cr, "text", 0);
 				actionCombo.Changed += new EventHandler(OptionsChanged);