mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 21:35:39 +00:00
don't rebuild content if we're being closed. bug 53953 r=brendan,hyatt
This commit is contained in:
parent
4656b9e277
commit
c092d9eaae
@ -480,8 +480,8 @@ nsBrowserInstance::ReinitializeContentVariables()
|
||||
nsresult nsBrowserInstance::GetContentAreaDocShell(nsIDocShell** outDocShell)
|
||||
{
|
||||
nsCOMPtr<nsIDocShell> docShell(do_QueryReferent(mContentAreaDocShellWeak));
|
||||
if (docShell) {
|
||||
// the docshell still exists, but has it been destroyed?
|
||||
if (!mIsClosed && docShell) {
|
||||
// we're still alive and the docshell still exists. but has it been destroyed?
|
||||
nsCOMPtr<nsIBaseWindow> hack = do_QueryInterface(docShell);
|
||||
if (hack) {
|
||||
nsCOMPtr<nsIWidget> parent;
|
||||
@ -491,7 +491,7 @@ nsresult nsBrowserInstance::GetContentAreaDocShell(nsIDocShell** outDocShell)
|
||||
docShell = 0;
|
||||
}
|
||||
}
|
||||
if (!docShell)
|
||||
if (!mIsClosed && !docShell)
|
||||
ReinitializeContentVariables();
|
||||
|
||||
docShell = do_QueryReferent(mContentAreaDocShellWeak);
|
||||
|
Loading…
Reference in New Issue
Block a user