npostavs@users.sourceforge.net writes:

> Here is a patch (the first one just simplifies the code).

I had a mistake in the first patch, here's a corrected version.