Merge pull request #378 from Orckestra/dev

Fixing issue where Checkbox Form Control fail when added to page afte…
Orckestra · Feb 1, 2017 · 261ddc1 · 261ddc1
2 parents adf26f6 + 78e263b
commit 261ddc1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Website/Composite/controls/FormsControls/FormUiControlTemplates/BoolSelectors/CheckBox.ascx b/Website/Composite/controls/FormsControls/FormUiControlTemplates/BoolSelectors/CheckBox.ascx
@@ -17,7 +17,7 @@
 
 	private bool ViewState_Checked
 	{
-		get { return (bool) ViewState[ViewStateKey]; }
+		get { return (bool) (ViewState[ViewStateKey] ?? this.Checked); }
 		set { ViewState[ViewStateKey] = value; }
 	}