diff options
| author | Pale Moon <git-repo@palemoon.org> | 2017-06-21 16:33:13 +0200 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2017-06-21 17:57:16 +0200 |
| commit | 9109a39838fb83308b8c35c9785f426de2e5bb92 (patch) | |
| tree | dc7f1449812d230a8497cb63332ed7d710717302 /docshell | |
| parent | d87370e280f88303afe5d1ffff33e9ce10550209 (diff) | |
| download | palemoon-gre-9109a39838fb83308b8c35c9785f426de2e5bb92.tar.gz | |
Ensure the right url is used for reloading.
Diffstat (limited to 'docshell')
| -rw-r--r-- | docshell/base/nsDocShell.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index 16e56cac9..6cc22e65c 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -5481,11 +5481,16 @@ nsDocShell::Reload(uint32_t aReloadFlags) } } - rv = InternalLoad2(mCurrentURI, + // Stack variables to ensure changes to the member variables don't affect + // the call. + nsCOMPtr<nsIURI> currentURI = mCurrentURI; + nsCOMPtr<nsIURI> referrerURI = mReferrerURI; + uint32_t referrerPolicy = mReferrerPolicy; + rv = InternalLoad2(currentURI, originalURI, loadReplace, - mReferrerURI, - mReferrerPolicy, + referrerURI, + referrerPolicy, principal, flags, nullptr, // No window target |