2010-07-10 Marek Habersack <[email protected]>

	* Control.cs: when setting ClientIDMode remember the value when
	setting the property for the first time.

svn path=/trunk/mcs/; revision=160187

mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,8 @@
+2010-07-10  Marek Habersack  <[email protected]>
+
+	* Control.cs: when setting ClientIDMode remember the value when
+	setting the property for the first time.
+
 2010-07-08  Marek Habersack  <[email protected]>
 
 	* Control.cs: if generating a predictable ID and the current

mcs/class/System.Web/System.Web.UI/Control.cs

@@ -315,7 +315,7 @@ namespace System.Web.UI
 			}
 			
 			set {
-				if (clientIDMode.HasValue && clientIDMode.Value != value) {
+				if (!clientIDMode.HasValue || clientIDMode.Value != value) {
 					ClearCachedClientID ();
 					ClearEffectiveClientIDMode ();
 					clientIDMode = value;