Fixed channel toggling in case 'Ok' has been pressed

This commit is contained in:
Klaus Schmidinger 2001-09-08 12:18:02 +02:00
parent 0c8cc01b1a
commit 57b324cd42
2 changed files with 10 additions and 5 deletions

View File

@ -725,3 +725,5 @@ Video Disk Recorder Revision History
- An error message is now displayed in case the Transfer Mode can't be
started because the necessary DVB card is currently recording (or there
is no DVB card that can access this channel).
- Fixed toggling channels with the '0' key in case the "Ok" button has been
pressed to display the current/next information.

13
vdr.c
View File

@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/people/kls/vdr
*
* $Id: vdr.c 1.69 2001/09/07 15:37:26 kls Exp $
* $Id: vdr.c 1.70 2001/09/08 12:15:05 kls Exp $
*/
#define _GNU_SOURCE
@ -329,7 +329,8 @@ int main(int argc, char *argv[])
if (!EITScanner.Active() && cDvbApi::CurrentChannel() != LastChannel) {
if (!Menu)
Menu = new cDisplayChannel(cDvbApi::CurrentChannel(), LastChannel > 0);
PreviousChannel = LastChannel;
if (LastChannel > 0)
PreviousChannel = LastChannel;
LastChannel = cDvbApi::CurrentChannel();
}
// Timers and Recordings:
@ -391,10 +392,12 @@ int main(int argc, char *argv[])
else {
switch (key) {
// Toggle channels:
case k0:
if (PreviousChannel != cDvbApi::CurrentChannel())
Channels.SwitchTo(PreviousChannel);
case k0: {
int CurrentChannel = cDvbApi::CurrentChannel();
Channels.SwitchTo(PreviousChannel);
PreviousChannel = CurrentChannel;
break;
}
// Direct Channel Select:
case k1 ... k9:
Menu = new cDisplayChannel(key);