corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for blocker bug 103036 -- crash when opening prefs dialog in Mac classic skin. Bullet-proof nsDocShell::FocusAvailable() against recursion, and fix the XBL to set focus later on. r=adamlock, sr=hyatt

Browse Source
This commit is contained in:
sfraser@netscape.com
2001-10-05 00:05:15 +00:00
parent b60776bef6
commit 1a91d78366
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docshell/base/nsDocShell.cpp
View File

@@ -3026,7 +3026,7 @@ nsDocShell::FocusAvailable(nsIBaseWindow * aCurrentFocus,
}
//Otherwise, check the chilren and offer it to the next sibling.
//Otherwise, check the children and offer it to the next sibling.
PRInt32 i;
PRInt32 n = mChildren.Count();
for (i = 0; i < n; i++) {
@@ -3076,7 +3076,11 @@ nsDocShell::FocusAvailable(nsIBaseWindow * aCurrentFocus,
// Call again to offer focus upwards and to start at the beginning of our
// child list if no one above us wants focus.
return FocusAvailable(this, aForward, aTookFocus);
if (NS_STATIC_CAST(nsIBaseWindow*, this) != aCurrentFocus)
return FocusAvailable(this, aForward, aTookFocus);
*aTookFocus = PR_FALSE;
return NS_OK;
}
NS_IMETHODIMP