summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2010-02-07 12:14:02 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2010-02-07 12:14:02 +0100
commit08e05d3fcda73c05d6553d110376b5882e9b1837 (patch)
treee159cadb2647232e7ec0377e783f1143922941da
parent978807e4d1873e878f3c23c4dda889c50a753a35 (diff)
downloadvdr-08e05d3fcda73c05d6553d110376b5882e9b1837.tar.gz
vdr-08e05d3fcda73c05d6553d110376b5882e9b1837.tar.bz2
Fixed adding new transponders in case there is only a single channel in the channel list
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--eitscan.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0455528d..6f01a941 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2384,6 +2384,8 @@ Halim Sahin <halim.sahin@t-online.de>
deleting or moving a channel in the Channels menu
for suggesting to add a note to the MANUAL, saying that adding new transponders only
works if the "EPG scan" is active
+ for reporting a problem with adding new transponders in case there is only a single
+ channel in the channel list
Denis Knauf <denis.knauf@gmail.com>
for reporting a missing '-' at the next to last line of SVDRP help texts
diff --git a/HISTORY b/HISTORY
index 4af6c0a3..82b2ea34 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6353,3 +6353,5 @@ Video Disk Recorder Revision History
- Added device definitions to the diseqc.conf file format, so that certain satellite
positions can be limited to a given list of devices.
- Keeping subtitles visible when pausing replay (thanks to Rolf Ahrenberg).
+- Fixed adding new transponders in case there is only a single channel in the
+ channel list (reported by Halim Sahin).
diff --git a/eitscan.c b/eitscan.c
index 5966f50f..2b43e718 100644
--- a/eitscan.c
+++ b/eitscan.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: eitscan.c 1.30 2006/01/07 14:10:17 kls Exp $
+ * $Id: eitscan.c 2.1 2010/02/07 12:12:05 kls Exp $
*/
#include "eitscan.h"
@@ -127,7 +127,7 @@ void cEITScanner::Activity(void)
void cEITScanner::Process(void)
{
- if ((Setup.EPGScanTimeout || !lastActivity) && Channels.MaxNumber() > 1) { // !lastActivity means a scan was forced
+ if (Setup.EPGScanTimeout || !lastActivity) { // !lastActivity means a scan was forced
time_t now = time(NULL);
if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
if (Channels.Lock(false, 10)) {