Settings code wierdness in some circumstances

I have been experiencing what looks like a code loop, or at least a wierd exit or something in the settings code under some fairly edge circumstances. Reading the code & code history suggests an error in the code and fixing it makes the problem go away.

I have encountered the issue on a multiple domain site, on domain 2 which is a wordpress site. The issue is in evidence when returning from making an offsite contribution payment. The code enters the deprecated CRM_Core_BAO_Domain::resetDomain(); function and never returns.

On reviewing the code this function is intended to undo what is done in

CRM_Core_BAO_Domain::setDomain($domainID);

And adjusting the code so that resetDomain is only called if the former function has been called fixes it. (it also means it isn't called - which is appropriate here). I am pretty sure the original usage of this function was thoroughly covered by tests and would be OK to remove it if the tests show no regression