Zap and record timer doesn't "zap" when in the media player or browser

[prl]

If you're in the media player selection list or playing a recording/media file and a zap and record timer starts, nothing happens to the media player state. When playback of live TV resumes, whether in the background of the media selection list or on return to live TV, the last channel viewed in live TV plays, not the channel of the zap and record channel. The correct channel records.

This bug is related to bugs #480 and #481, but the mechanism for the "zap" part of the timer to exit the media player is also missing for "zap and record" timers.

Replication steps - media player

Create a "zap and record" timer for a few minutes in the future for a channel other than the one currently showing in live TV.

Return to live TV, then MEDIA, to enter the media browser, navigate to media file or recording, OK to start playing in the media player.

Leave the file playing until the timer starts.

When the timer starts, the recording starts correctly, but the media player continues to play, and when the media player exits and restarts the service (if enabled), or if the media browser is then exitted, the channel shown is the one that was on live TV before the media browser started, not the channel in the zap timer.

Replication steps - media browser

Create a "zap and record" timer for a few minutes in the future for a channel other than the one currently showing in live TV.

Return to live TV, then MEDIA, to enter the media browser.

Remain in the media browser until the timer starts.

When the timer starts, the recording starts correctly, but the background service in the media browser continues to play, and when the media browser is then exited, the channel shown is the one that was on live TV before the media browser started, not the channel in the zap timer.