wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 22:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

[XPFE] Properly anchor XUL windows when tearing down

Browse source
This commit is contained in:
Moonchild 2020-05-06 11:15:48 +00:00 • committed by Roy Tam
commit 36f366b0ed
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xpfe/appshell/nsXULWindow.cpp
View file

@ -455,6 +455,8 @@ NS_IMETHODIMP nsXULWindow::Destroy()
if (mDestroying) if (mDestroying)
return NS_OK; return NS_OK;
nsCOMPtr<nsIXULWindow> kungFuDeathGrip(this);
mozilla::AutoRestore<bool> guard(mDestroying); mozilla::AutoRestore<bool> guard(mDestroying);
mDestroying = true; mDestroying = true;
@ -467,16 +469,6 @@ NS_IMETHODIMP nsXULWindow::Destroy()
if (parentWindow) if (parentWindow)
parentWindow->RemoveChildWindow(this); parentWindow->RemoveChildWindow(this);
// let's make sure the window doesn't get deleted out from under us
// while we are trying to close....this can happen if the docshell
// we close ends up being the last owning reference to this xulwindow
// XXXTAB This shouldn't be an issue anymore because the ownership model
// only goes in one direction. When webshell container is fully removed
// try removing this...
nsCOMPtr<nsIXULWindow> placeHolder = this;
// Remove modality (if any) and hide while destroying. More than // Remove modality (if any) and hide while destroying. More than
// a convenience, the hide prevents user interaction with the partially // a convenience, the hide prevents user interaction with the partially
// destroyed window. This is especially necessary when the eldest window // destroyed window. This is especially necessary when the eldest window