"Continue timeshifting" when saving current timeshift cancels timeshift save

[prl]

If the current timeshift event is being saved, and a channel change is requested, the "You have chosen to save the current timeshift event, but the event has not yet finished. What do you want to do?" popup is shown.

If "Continue timeshifting" is selected, the channel change is cancelled, but the timeshift save is also cancelled.

The timeshift save should not be cancelled, as there is no other option that allows the timeshift save to simply continue as originally requested.

The option name is also inappropriate, because the user isn't necessarily timeshifted.

The option should probably be something like "Cancel channel change" or "Cancel channel change and continue saving timeshift".

Replication steps

Wait until a new program isn't due to start for a few minutes on the live TV channel.

REC>Select an event to save>Current Event: event name

Wait for "event name will be saved at end of event." popup to close.

Press CH+. The "You have chosen to save the current timeshift event, but the event has not yet finished. What do you want to do?" popup is shown.

Select "Continue timeshifting".

Press REC. The "Start recording?" popup is shown, rather than "Timeshift is marked to be saved. What do you want to do?", and it doesn't display the "Cancel timeshift save", because the timeshift save has been cancelled by the "Continue timeshifting" option above.

[Peter Urbanec]

Fix Bug #488: "Continue timeshifting" when saving current timeshift cancels timeshift save

[InfoBarTimeshift]

Only set self.save_current_timeshift to False when the action passed to checkTimeshiftRunningCallback() or saveTimeshiftActions() is "noSave".

Change the "Continue timeshifting" option in the "You have chosen to save the current timeshift event, but the event has not yet finished. What do you want to do?" popup to "Continue save timeshift", because the popup is due to a pending timeshift shave and can happen when the user is not timeshifted.

→ <<cset f67e90cad23a>>