From 60b83574632e24fecb8e6e3bf78a33c2988f2fc8 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 8 Jun 2003 09:25:07 +0200 Subject: Initializing the current channel to '1' --- CONTRIBUTORS | 2 ++ HISTORY | 5 ++++- device.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c8e6b3eb..7e5886d2 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -620,6 +620,8 @@ Sascha Volkenandt Malcolm Caldwell for modifying LOF handling to allow for C-band reception + for reporting a crash in creating a new timer in case there is no device in the + system that can actually receive any channel Ludwig Nussel for making the LIRC thread avoid high CPU load in case the connection to LIRC gets lost diff --git a/HISTORY b/HISTORY index b25502e7..a0e0e026 100644 --- a/HISTORY +++ b/HISTORY @@ -2235,7 +2235,7 @@ Video Disk Recorder Revision History - Some corrections to the Finnish OSD texts (thanks to Jaakko Hyvätti). - Officially released as version 1.2.0. -2003-06-07: Version 1.2.1 +2003-06-08: Version 1.2.1 - Fixed OSD access in case none of the devices provides one (thanks to Axel Gruber for reporting this one). @@ -2248,3 +2248,6 @@ Video Disk Recorder Revision History - Fixed device handling in the CICAM menu in case a VDR instance was started with a specific device using the -D option (thanks to Gerald Raaf for reporting ths one). +- Initializing the current channel to '1' to avoid a crash in creating a new + timer in case there is no device in the system that can actually receive any + channel (thanks to Malcolm Caldwell for reporting this one). diff --git a/device.c b/device.c index 58f9bf0a..f43870ad 100644 --- a/device.c +++ b/device.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 1.44 2003/05/25 10:57:59 kls Exp $ + * $Id: device.c 1.45 2003/06/08 09:19:59 kls Exp $ */ #include "device.h" @@ -28,7 +28,7 @@ int cDevice::numDevices = 0; int cDevice::useDevice = 0; int cDevice::nextCardIndex = 0; -int cDevice::currentChannel = 0; +int cDevice::currentChannel = 1; cDevice *cDevice::device[MAXDEVICES] = { NULL }; cDevice *cDevice::primaryDevice = NULL; -- cgit v1.2.3