I agree, it shouldn't.

Triode: would this be yours?

Yes - will need something to exclude this case specifically.  Will look at for 7.2.1

I can't see a trivial way of implementing this - I think it needs changes to the IR processing logic.

Does the following sound reasonable, and do you think it will break anything:

1) In the map file we define sections for [screensaver], [idlesaver] and [offsaver]
2) When the IR code finds the current mode is SCREENSAVER.* then it uses screensaver/idlesaver/offsaver as as the mode to lookup in the map file (based on the current screensaver mode.
3) By doing this we can have different map entries for the two types of screensaver. 

Otherwise we end up putting special cases in every screensaver.

Sounds good to me, Triode.

I don't know enough about the IR and mode code to know if it will work, so I don't have an opinion. :)

change 22945

Same idea but I found a way of doing this which extended the current scheme to give a separate map file entry for off, so less changes than originally planned.