diff options
| -rw-r--r-- | src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdLogin.cs | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdLogin.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdLogin.cs index f89ec0a..c13c61c 100644 --- a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdLogin.cs +++ b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdLogin.cs @@ -643,11 +643,13 @@ namespace DotNetOpenAuth.OpenId.RelyingParty { set { base.UsePersistentCookie = value; - // use conditional here to prevent infinite recursion - // with CheckedChanged event. - bool rememberMe = value != LogOnPersistence.Session; - if (this.rememberMeCheckBox.Checked != rememberMe) { - this.rememberMeCheckBox.Checked = rememberMe; + if (this.rememberMeCheckBox != null) { + // use conditional here to prevent infinite recursion + // with CheckedChanged event. + bool rememberMe = value != LogOnPersistence.Session; + if (this.rememberMeCheckBox.Checked != rememberMe) { + this.rememberMeCheckBox.Checked = rememberMe; + } } } } @@ -782,7 +784,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty { cell = new TableCell(); this.rememberMeCheckBox = new CheckBox(); this.rememberMeCheckBox.Text = RememberMeTextDefault; - this.rememberMeCheckBox.Checked = RememberMeDefault; + this.rememberMeCheckBox.Checked = this.UsePersistentCookie != LogOnPersistence.Session; this.rememberMeCheckBox.Visible = RememberMeVisibleDefault; this.rememberMeCheckBox.CheckedChanged += this.RememberMeCheckBox_CheckedChanged; cell.Controls.Add(this.rememberMeCheckBox); |