From f521d3ac1b6d9f94afbf37556885d567874e0230 Mon Sep 17 00:00:00 2001
From: "troy%netscape.com" <troy%netscape.com>
Date: Tue, 14 Sep 1999 22:16:42 +0000
Subject: [PATCH] Fix for bug #13780. Added NULL pointer check to
 PreferenceChanged()

---
 layout/base/nsPresContext.cpp     | 33 +++++++++++++++++--------------
 layout/base/src/nsPresContext.cpp | 33 +++++++++++++++++--------------
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp
index 2dc19d215465..77829707102a 100644
--- a/layout/base/nsPresContext.cpp
+++ b/layout/base/nsPresContext.cpp
@@ -244,22 +244,25 @@ nsPresContext::PreferenceChanged(const char* aPrefName)
   // Initialize our state from the user preferences
   GetUserPreferences();
 
-  // Have the root frame's style context remap its style based on the
-  // user preferences
-  nsIFrame*         rootFrame;
-  nsIStyleContext*  rootStyleContext;
+  if (mShell) {
+    // Have the root frame's style context remap its style based on the
+    // user preferences
+    nsIFrame* rootFrame;
 
-  mShell->GetRootFrame(&rootFrame);
-  if (nsnull != rootFrame) {
-    rootFrame->GetStyleContext(&rootStyleContext);
-    rootStyleContext->RemapStyle(this);
-    NS_RELEASE(rootStyleContext);
-  
-    // Force a reflow of the root frame
-    // XXX We really should only do a reflow if a preference that affects
-    // formatting changed, e.g., a font change. If it's just a color change
-    // then we only need to repaint...
-    mShell->StyleChangeReflow();
+    mShell->GetRootFrame(&rootFrame);
+    if (rootFrame) {
+      nsIStyleContext*  rootStyleContext;
+
+      rootFrame->GetStyleContext(&rootStyleContext);
+      rootStyleContext->RemapStyle(this);
+      NS_RELEASE(rootStyleContext);
+    
+      // Force a reflow of the root frame
+      // XXX We really should only do a reflow if a preference that affects
+      // formatting changed, e.g., a font change. If it's just a color change
+      // then we only need to repaint...
+      mShell->StyleChangeReflow();
+    }
   }
 }
 
diff --git a/layout/base/src/nsPresContext.cpp b/layout/base/src/nsPresContext.cpp
index 2dc19d215465..77829707102a 100644
--- a/layout/base/src/nsPresContext.cpp
+++ b/layout/base/src/nsPresContext.cpp
@@ -244,22 +244,25 @@ nsPresContext::PreferenceChanged(const char* aPrefName)
   // Initialize our state from the user preferences
   GetUserPreferences();
 
-  // Have the root frame's style context remap its style based on the
-  // user preferences
-  nsIFrame*         rootFrame;
-  nsIStyleContext*  rootStyleContext;
+  if (mShell) {
+    // Have the root frame's style context remap its style based on the
+    // user preferences
+    nsIFrame* rootFrame;
 
-  mShell->GetRootFrame(&rootFrame);
-  if (nsnull != rootFrame) {
-    rootFrame->GetStyleContext(&rootStyleContext);
-    rootStyleContext->RemapStyle(this);
-    NS_RELEASE(rootStyleContext);
-  
-    // Force a reflow of the root frame
-    // XXX We really should only do a reflow if a preference that affects
-    // formatting changed, e.g., a font change. If it's just a color change
-    // then we only need to repaint...
-    mShell->StyleChangeReflow();
+    mShell->GetRootFrame(&rootFrame);
+    if (rootFrame) {
+      nsIStyleContext*  rootStyleContext;
+
+      rootFrame->GetStyleContext(&rootStyleContext);
+      rootStyleContext->RemapStyle(this);
+      NS_RELEASE(rootStyleContext);
+    
+      // Force a reflow of the root frame
+      // XXX We really should only do a reflow if a preference that affects
+      // formatting changed, e.g., a font change. If it's just a color change
+      // then we only need to repaint...
+      mShell->StyleChangeReflow();
+    }
   }
 }