Removed a redundant NULL check in cDvbSpuDecoder::setTime()

3 files changed, 4 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 893dc0b9..b1479b23 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1931,6 +1931,7 @@ Ville Skyttä <ville.skytta@iki.fi>
  for changing the default location for the LIRC socket to /var/run/lirc/lircd
  for pointing out that the argument sequence in the memset() call in the ctor of
  cSatCableNumbers was wrong
+ for removing a redundant NULL check in cDvbSpuDecoder::setTime()
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index 1ed1f272..2d004959 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6791,3 +6791,4 @@ Video Disk Recorder Revision History
   link levels (reported by Sundararaj Reel).
 - Removed redundant memset() in the ctor of cSatCableNumbers (triggered by
   Ville Skyttä pointing out that the argument sequence in the call was wrong).
+- Removed a redundant NULL check in cDvbSpuDecoder::setTime() (thanks to Ville Skyttä).
diff --git a/dvbspu.c b/dvbspu.c
index 951e2f8c..25af228b 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 2.8 2010/01/17 13:43:27 kls Exp $
+ * $Id: dvbspu.c 2.9 2011/12/10 14:39:19 kls Exp $
  */
 
 #include "dvbspu.h"
@@ -496,7 +496,7 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
     if (!spu)
         return 0;
 
-    if (spu && !clean)
+    if (!clean)
         Draw();
 
     while (DCSQ_offset != prev_DCSQ_offset) {   /* Display Control Sequences */