summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-07-17 14:35:31 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2004-07-17 14:35:31 +0200
commit4807f978e5ad6f2310b71f10ab56c268bfb04852 (patch)
treeab96895415b8d4a6833af4b2ea297a268d9c352d
parent8d0a800391859a151019c05d898a581013f01f73 (diff)
downloadvdr-4807f978e5ad6f2310b71f10ab56c268bfb04852.tar.gz
vdr-4807f978e5ad6f2310b71f10ab56c268bfb04852.tar.bz2
Fixed handling error case '-1' when polling section filters
-rw-r--r--CONTRIBUTORS1
-rw-r--r--HISTORY2
-rw-r--r--sections.c4
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2a5245bd..2c4a4d91 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1029,6 +1029,7 @@ Marco Schlüßler <marco@lordzodiac.de>
for fixing missing audio after replaying a DVD
for pointing out that it is unnecessary to add section filters to the list of
filters if they can't be opened
+ for fixing handling error case '-1' when polling section filters
Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index a3af1825..7a448521 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2949,3 +2949,5 @@ Video Disk Recorder Revision History
to Reinhard Nissl for reporting this one).
- No longer adding section filters to the list of filters if they can't be opened
(thanks to Marco Schlüßler for pointing this out).
+- Fixed handling error case '-1' when polling section filters (thanks to Marco
+ Schlüßler).
diff --git a/sections.c b/sections.c
index d3fc2b0d..3b2dbe9b 100644
--- a/sections.c
+++ b/sections.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: sections.c 1.6 2004/07/17 14:17:07 kls Exp $
+ * $Id: sections.c 1.7 2004/07/17 14:26:32 kls Exp $
*/
#include "sections.h"
@@ -172,7 +172,7 @@ void cSectionHandler::Action(void)
int oldStatusCount = statusCount;
Unlock();
- if (poll(pfd, NumFilters, 1000) != 0) {
+ if (poll(pfd, NumFilters, 1000) > 0) {
bool DeviceHasLock = device->HasLock();
if (!DeviceHasLock)
usleep(100000);