Fix 'EIT: Add 'EIT - skip TSID check' per mux settings', fixes #2858

tvheadend · Sep 21, 2015 · 62a795e · 62a795e
1 parent 19ab925
commit 62a795e
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
@@ -641,11 +641,10 @@ _eit_callback
     mm = mpegts_network_find_mux(mm->mm_network, onid, tsid);
 
   } else {
-    if (mm->mm_tsid != tsid ||
-        mm->mm_onid != onid) {
+    if ((mm->mm_tsid != tsid || mm->mm_onid != onid) &&
+        !mm->mm_eit_tsid_nocheck) {
       if (mm->mm_onid != MPEGTS_ONID_NONE &&
-          mm->mm_tsid != MPEGTS_TSID_NONE &&
-          !mm->mm_eit_tsid_nocheck)
+          mm->mm_tsid != MPEGTS_TSID_NONE)
         tvhtrace("eit",
                 "invalid tsid found tid 0x%02X, onid:tsid %d:%d != %d:%d",
                 tableid, mm->mm_onid, mm->mm_tsid, onid, tsid);