2009-02-28 Gonzalo Paniagua Javier <gonzalo@novell.com>

	* Control.cs: Avoid double OnInit in scenarios with two master
	pages.

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

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index ef8c717bb3967e371124904546b02ea795e2be03..d2fc573a1a9ee1e428494f8608d2f692a2ed2365 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-28  Gonzalo Paniagua Javier <gonzalo@novell.com>
+
+       * Control.cs: Avoid double OnInit in scenarios with two master
+       pages.
+
 2009-02-26  Marek Habersack  <mhabersack@novell.com>
 
        * FileLevelControlBuilderAttribute.cs,

diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs
index 5a0236837d53e3138b5732681f4b2950b02033cb..68a659784668040bef379490564d918c3819441b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Control.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.cs
@@ -1573,7 +1573,7 @@ namespace System.Web.UI
                                }
                        }
 
-                       if ((stateMask & REMOVED) == 0) {
+                       if ((stateMask & REMOVED) == 0 && (stateMask & INITED) != INITED) {
                                stateMask |= INITING;
 #if NET_2_0
                                ApplyTheme ();