Merge branch 'master'

Kinnara · Oct 3, 2013 · 64a76ca · 64a76ca
2 parents e29bff1 + bff6607
commit 64a76ca
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Microsoft.Phone.Controls.Toolkit/CustomMessageBox/CustomMessageBox.cs b/Microsoft.Phone.Controls.Toolkit/CustomMessageBox/CustomMessageBox.cs
@@ -721,7 +721,13 @@ private void ClosePopup(bool restoreOriginalValues, CustomMessageBoxResult sourc
                 if (_hasApplicationBar)
                 {
                     _hasApplicationBar = false;
-                    _page.ApplicationBar.IsVisible = true;
+
+                    // Application bar can be nulled during the Dismissed event
+                    // so a null check needs to be performed here.
+                    if (_page.ApplicationBar != null)
+                    {
+                        _page.ApplicationBar.IsVisible = true;
+                    }
                 }                
             }