frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed adding new transponders in case there is only a single channel in the channel list

This commit is contained in:
Klaus Schmidinger 2010-02-07 12:14:02 +01:00
parent 978807e4d1
commit 08e05d3fcd
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -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

2
HISTORY
View File

@ -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).

4
eitscan.c
View File

@ -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)) {