зеркало из https://github.com/mozilla/pjs.git
Fix for bug # 58216 r/sr=rpotts
This commit is contained in:
Родитель
51c458b13e
Коммит
d7a6535067
|
@ -530,17 +530,13 @@ nsSHistory::CompareSHEntry(nsISHEntry * aPrevEntry, nsISHEntry * aNextEntry, nsI
|
||||||
|
|
||||||
PRBool result = PR_FALSE;
|
PRBool result = PR_FALSE;
|
||||||
nsCOMPtr<nsIURI> prevURI, nextURI;
|
nsCOMPtr<nsIURI> prevURI, nextURI;
|
||||||
|
PRUint32 prevID, nextID;
|
||||||
|
|
||||||
aPrevEntry->GetURI(getter_AddRefs(prevURI));
|
aPrevEntry->GetID(&prevID);
|
||||||
aNextEntry->GetURI(getter_AddRefs(nextURI));
|
aNextEntry->GetID(&nextID);
|
||||||
|
|
||||||
// If one of the URIs is not available, then the entries are not
|
// Check the IDs to verify if the pages are different.
|
||||||
// equal...
|
if (prevID != nextID) {
|
||||||
if (!prevURI || !nextURI)
|
|
||||||
return PR_FALSE;
|
|
||||||
|
|
||||||
prevURI->Equals(nextURI, &result);
|
|
||||||
if (!result) {
|
|
||||||
*aDSResult = aParent;
|
*aDSResult = aParent;
|
||||||
*aSHEResult = aNextEntry;
|
*aSHEResult = aNextEntry;
|
||||||
NS_IF_ADDREF(*aSHEResult);
|
NS_IF_ADDREF(*aSHEResult);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче