Fixed channel up/down switching on single card systems

3 files changed, 5 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0053b674..dcfc1849 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -215,6 +215,7 @@ Stefan Huelswitt <huels@iname.com>
  path names
  for suggesting that the SVDRP command GRAB should allow file names without extension
  again
+ for reporting a problem with channel up/down switching on single card systems
 
 Ulrich Röder <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
diff --git a/HISTORY b/HISTORY
index b1cdacc9..2a0c9def 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4276,3 +4276,5 @@ Video Disk Recorder Revision History
 - Removed leftover 'needsBufferReserve' variable from cTransfer (thanks to Marco
   Schlüßler).
 - Fixed setting "No title" for broken event data (reported by Ronny Kornexl).
+- Fixed channel up/down switching on single card systems (reported by Stefan
+  Huelswitt).
diff --git a/menu.c b/menu.c
index 4aa53977..acfece15 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.407 2006/01/29 14:04:37 kls Exp $
+ * $Id: menu.c 1.408 2006/02/03 13:24:53 kls Exp $
  */
 
 #include "menu.h"
@@ -3083,7 +3083,7 @@ cChannel *cDisplayChannel::NextAvailableChannel(cChannel *Channel, int Direction
   if (Direction) {
      while (Channel) {
            Channel = Direction > 0 ? Channels.Next(Channel) : Channels.Prev(Channel);
-           if (Channel && !Channel->GroupSep() && cDevice::GetDevice(Channel, 0))
+           if (Channel && !Channel->GroupSep() && (cDevice::PrimaryDevice()->ProvidesChannel(Channel, Setup.PrimaryLimit) || cDevice::GetDevice(Channel, 0)))
               return Channel;
            }
      }