aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/EphyWrapper.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b4ef9912..41a09c7fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-06 Christian Persch <chpe+gnomebugz@stud.uni-saarland.de>
+
+ * embed/mozilla/EphyWrapper.cpp: (EphyWrapper::SetZoomOnDocshell):
+
+ Check for NULL PresContext.
+
2003-05-06 Marco Pesenti Gritti <marco@it.gnome.org>
* embed/mozilla/mozilla-embed-single.cpp:
diff --git a/embed/mozilla/EphyWrapper.cpp b/embed/mozilla/EphyWrapper.cpp
index b5ae3a24a..7268c4a69 100644
--- a/embed/mozilla/EphyWrapper.cpp
+++ b/embed/mozilla/EphyWrapper.cpp
@@ -356,7 +356,7 @@ nsresult EphyWrapper::SetZoomOnDocshell (float aZoom, nsIDocShell *DocShell)
nsCOMPtr<nsIPresContext> PresContext;
result = DocShell->GetPresContext (getter_AddRefs(PresContext));
- if (NS_FAILED(result)) return NS_ERROR_FAILURE;
+ if (NS_FAILED(result) || !PresContext) return NS_ERROR_FAILURE;
nsCOMPtr<nsIDeviceContext> DeviceContext;
result = PresContext->GetDeviceContext (getter_AddRefs(DeviceContext));