summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-02-08 14:15:01 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-02-08 14:15:01 +0100
commit0d6715d862424215dbdc44f8e0742592b53143bd (patch)
tree0c22943c04f2a93967ae408a225a29e6d7a7bfb8
parent64683c24380dd9b6b064deb3cd3e7051d7b42da7 (diff)
downloadvdr-0d6715d862424215dbdc44f8e0742592b53143bd.tar.gz
vdr-0d6715d862424215dbdc44f8e0742592b53143bd.tar.bz2
No longer closing the Channels menu after trying to switch to a channel that is currently not available
-rw-r--r--HISTORY2
-rw-r--r--menu.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 7858dc41..31963ce1 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2646,3 +2646,5 @@ Video Disk Recorder Revision History
value 0 (thanks to Thomas Bergwinkl).
- Enabled switching to a channel even if it has no Vpid or Apid set, because these
might be automatically set when tuned to that transponder.
+- No longer closing the Channels menu after trying to switch to a channel that
+ is currently not available.
diff --git a/menu.c b/menu.c
index e834db46..5b40f166 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.282 2004/01/25 14:40:00 kls Exp $
+ * $Id: menu.c 1.283 2004/02/08 14:12:23 kls Exp $
*/
#include "menu.h"
@@ -723,7 +723,7 @@ eOSState cMenuChannels::Switch(void)
return osContinue;
cChannel *ch = GetChannel(Current());
if (ch)
- cDevice::PrimaryDevice()->SwitchChannel(ch, true);
+ return cDevice::PrimaryDevice()->SwitchChannel(ch, true) ? osEnd : osContinue;
return osEnd;
}