summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPale Moon <git-repo@palemoon.org>2016-10-13 21:43:05 +0200
committerPale Moon <git-repo@palemoon.org>2016-10-13 21:43:05 +0200
commit92a906d49d2986e41536812ed3003fba9b37b817 (patch)
tree92bd50213dc31986b20f437e458970de368b8e90
parentfebf096ace36ef5ec2df0146b9264b0eca759cb2 (diff)
downloadpalemoon-gre-92a906d49d2986e41536812ed3003fba9b37b817.tar.gz
Fix favicon handling on hash navigation.
-rw-r--r--docshell/base/nsDocShell.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 37f72583b..e9998e850 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -10251,10 +10251,6 @@ nsDocShell::InternalLoad2(nsIURI* aURI,
SetDocCurrentStateObj(mOSHE);
- // Inform the favicon service that the favicon for oldURI also
- // applies to aURI.
- CopyFavicon(currentURI, aURI, mInPrivateBrowsing);
-
nsRefPtr<nsGlobalWindow> win = mScriptGlobal ?
mScriptGlobal->GetCurrentInnerWindowInternal() : nullptr;
@@ -10296,6 +10292,10 @@ nsDocShell::InternalLoad2(nsIURI* aURI,
}
}
+ // Inform the favicon service that the favicon for oldURI also
+ // applies to aURI.
+ CopyFavicon(currentURI, aURI, mInPrivateBrowsing);
+
return NS_OK;
}
}