aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
Diffstat (limited to 'embed')
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index d09bfca5e..54697db81 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -604,6 +604,8 @@ nsresult EphyBrowser::GetPageDescriptor(nsISupports **aPageDescriptor)
nsresult EphyBrowser::GetDocumentUrl (nsCString &url)
{
+ if (!mDOMWindow) return NS_ERROR_FAILURE;
+
nsCOMPtr<nsIDOMDocument> DOMDocument;
mDOMWindow->GetDocument (getter_AddRefs(DOMDocument));
NS_ENSURE_TRUE (DOMDocument, NS_ERROR_FAILURE);
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index 3ab68b9ab..444e8bfc5 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -485,8 +485,6 @@ impl_get_location (EphyEmbed *embed,
nsresult rv;
nsCAutoString url;
- if (mpriv->browser == NULL) return NULL;
-
if (toplevel)
{
rv = mpriv->browser->GetDocumentUrl (url);