Corrected the "extresist" node merge routine to not merge away the
ResNodeAtOrigin node, but to instead move it to the remaining valid node.
This commit is contained in:
parent
3934b77f64
commit
8d61bae1f1
|
|
@ -995,6 +995,9 @@ ResMergeNodes(node1, node2, pendingList, doneList)
|
||||||
node2->rn_client = (ClientData)NULL;
|
node2->rn_client = (ClientData)NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Don't merge away the ResNodeAtOrigin node */
|
||||||
|
if (ResNodeAtOrigin == node2) ResNodeAtOrigin = node1;
|
||||||
|
|
||||||
node2->rn_re = (resElement *)CLIENTDEFAULT;
|
node2->rn_re = (resElement *)CLIENTDEFAULT;
|
||||||
node2->rn_ce = (cElement *)CLIENTDEFAULT;
|
node2->rn_ce = (cElement *)CLIENTDEFAULT;
|
||||||
node2->rn_je = (jElement *)CLIENTDEFAULT;
|
node2->rn_je = (jElement *)CLIENTDEFAULT;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue