summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2020-10-16 13:50:36 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2020-10-16 13:50:36 +0200
commitc5461ffd9f5f71b6847165034354347e032d9187 (patch)
treee9e4a37b07dc888394dd68f4721d25744c64f57d
parent8c1c92bff6a032582e480268ecc7048ecbf86fcd (diff)
downloadvdr-c5461ffd9f5f71b6847165034354347e032d9187.tar.gz
vdr-c5461ffd9f5f71b6847165034354347e032d9187.tar.bz2
Now checking for an empty command in cDvbTuner::GetSignalStats() to avoid a possible error message
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY2
-rw-r--r--dvbdevice.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index de59b317..88139b51 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3624,6 +3624,8 @@ Helmut Binder <cco@aon.at>
for implementing handling multi packet CATs with MTD
for adding checking the symbol rate to cDvbTuner::IsTunedTo(), which apparently got
lost in version 1.7.13
+ for adding a check for an empty command in cDvbTuner::GetSignalStats() to avoid a
+ possible error message
Ulrich Eckhardt <uli@uli-eckhardt.de>
for reporting a problem with shutdown after user inactivity in case a plugin is
diff --git a/HISTORY b/HISTORY
index 9e50ea2a..656e6e78 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9530,3 +9530,5 @@ Video Disk Recorder Revision History
several HD programmes.
- Added checking the symbol rate to cDvbTuner::IsTunedTo(), which apparently got lost
in version 1.7.13 (thanks to Helmut Binder).
+- Now checking for an empty command in cDvbTuner::GetSignalStats() to avoid a possible
+ error message (thanks to Helmut Binder).
diff --git a/dvbdevice.c b/dvbdevice.c
index 1ec903ee..93e01d71 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 4.25 2020/10/16 13:42:13 kls Exp $
+ * $Id: dvbdevice.c 4.26 2020/10/16 13:50:36 kls Exp $
*/
#include "dvbdevice.h"
@@ -900,7 +900,7 @@ bool cDvbTuner::GetSignalStats(int &Valid, double *Strength, double *Cnr, double
SETCMD(DTV_STAT_POST_TOTAL_BIT_COUNT, 0); }
if (Per) { SETCMD(DTV_STAT_ERROR_BLOCK_COUNT, 0);
SETCMD(DTV_STAT_TOTAL_BLOCK_COUNT, 0); }
- if (ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
+ if (CmdSeq.num && ioctl(fd_frontend, FE_GET_PROPERTY, &CmdSeq) != 0) {
esyslog("ERROR: frontend %d/%d: %m (%s:%d)", adapter, frontend, __FILE__, __LINE__);
return false;
}