frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed switching channels in the Schedule menu after going through various Now and Schedule menus for different channels

Browse Source
This commit is contained in:
Klaus Schmidinger 2015-02-03 10:52:33 +01:00
parent 0703fbf527
commit 93ec1a9df2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -3216,6 +3216,8 @@ Matthias Senzel <matthias.senzel@t-online.de>
with device bonding with device bonding
for reporting a problem with handling overlapping pending timers for reporting a problem with handling overlapping pending timers
for fixing the German translation of "Binary skip timeout (s)" for fixing the German translation of "Binary skip timeout (s)"
for reporting a bug in switching channels in the Schedule menu after going through
various Now and Schedule menus for different channels
Marek Nazarko <mnazarko@gmail.com> Marek Nazarko <mnazarko@gmail.com>
for translating OSD texts to the Polish language for translating OSD texts to the Polish language

2
HISTORY
View File

@ -8480,3 +8480,5 @@ Video Disk Recorder Revision History
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Updated the Romanian OSD texts (thanks to Lucian Muresan). - Updated the Romanian OSD texts (thanks to Lucian Muresan).
- Updated the Hungarian OSD texts (thanks to István Füley). - Updated the Hungarian OSD texts (thanks to István Füley).
- Fixed switching channels in the Schedule menu after going through various Now and
Schedule menus for different channels (reported by Matthias Senzel).

11
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menu.c 3.36 2015/02/02 12:23:18 kls Exp $ * $Id: menu.c 3.37 2015/02/03 10:42:55 kls Exp $
*/ */
#include "menu.h" #include "menu.h"
@ -1748,9 +1748,12 @@ eOSState cMenuSchedule::Record(void)
eOSState cMenuSchedule::Switch(void) eOSState cMenuSchedule::Switch(void)
{ {
if (otherChannel) { cMenuScheduleItem *item = (cMenuScheduleItem *)Get(Current());
if (Channels.SwitchTo(otherChannel)) if (item) {
return osEnd; if (cChannel *Channel = Channels.GetByChannelID(item->event->ChannelID(), true)) {
if (Channels.SwitchTo(Channel->Number()))
return osEnd;
}
} }
Skins.Message(mtError, tr("Can't switch channel!")); Skins.Message(mtError, tr("Can't switch channel!"));
return osContinue; return osContinue;