summaryrefslogtreecommitdiff
path: root/dvbdevice.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-02-24 18:00:00 +0100
committerKlaus Schmidinger <kls (at) cadsoft (dot) de>2007-02-24 18:00:00 +0100
commitb144f230a74e9cfdb131e1f20a104522f28d76f0 (patch)
tree99e5d9b991262a64bcc780d2dd180e3145890add /dvbdevice.c
parent3f26d6dd96745dcdbaed98ce6ac764594e3495d3 (diff)
downloadvdr-patch-lnbsharing-b144f230a74e9cfdb131e1f20a104522f28d76f0.tar.gz
vdr-patch-lnbsharing-b144f230a74e9cfdb131e1f20a104522f28d76f0.tar.bz2
Version 1.4.5-2vdr-1.4.5-2
- Removed 'assert(0)' from cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler). - Fixed a possible crash when loading an invalid XPM file (thanks to Martin Wache). - Updated satellite names in 'sources.conf' (thanks to Thilo Wunderlich). - Fixed handling error status in cDvbTuner::GetFrontendStatus() (thanks to Reinhard Nissl).
Diffstat (limited to 'dvbdevice.c')
-rw-r--r--dvbdevice.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/dvbdevice.c b/dvbdevice.c
index fb8ec93..955483e 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbdevice.c 1.160 2006/08/14 09:38:32 kls Exp $
+ * $Id: dvbdevice.c 1.160.1.1 2007/02/24 11:10:14 kls Exp $
*/
#include "dvbdevice.h"
@@ -157,15 +157,14 @@ bool cDvbTuner::GetFrontendStatus(fe_status_t &Status, int TimeoutMs)
; // just to clear the event queue - we'll read the actual status below
}
}
- do {
- int stat = ioctl(fd_frontend, FE_READ_STATUS, &Status);
- if (stat == 0)
- return true;
- if (stat < 0) {
- if (errno == EINTR)
+ while (1) {
+ int stat = ioctl(fd_frontend, FE_READ_STATUS, &Status);
+ if (stat == 0)
+ return true;
+ if (stat < 0 && errno == EINTR)
continue;
+ break;
}
- } while (0);
return false;
}