From 57b324cd424aa2d4be111fb824e2a024c7f1fc11 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 8 Sep 2001 12:18:02 +0200
Subject: [PATCH] Fixed channel toggling in case 'Ok' has been pressed

---
 HISTORY |  2 ++
 vdr.c   | 13 ++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index 9815f979..6b069801 100644
--- a/HISTORY
+++ b/HISTORY
@@ -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.
diff --git a/vdr.c b/vdr.c
index a41fa5d0..f71cfd12 100644
--- a/vdr.c
+++ b/vdr.c
@@ -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);