Fix #7398: avoid infinite loop

[dimbleby]

Fixes #7398

I don't know if anyone really understands this code - if they do, hopefully they'll show up and review this!

Anyway the condition that I've added is basically the same as the one in the block above it, so I'm reasonably confident that it's safe...