Ticket #1485: dvb_scanning_fixes-v2.patch

libs/libmythtv/siscan.cpp

@@ -223 +223 @@
     // Add pmts to list, so we can do MPEG scan properly.
     ScanStreamData *sd = GetDTVSignalMonitor()->GetScanStreamData();
     for (uint i = 0; i < pat->ProgramCount(); i++)
-        sd->AddListeningPID(pat->ProgramPID(i));
+    {
+        if (pat->ProgramPID(i)) // don't add NIT "program", MPEG/ATSC safe.
+            sd->AddListeningPID(pat->ProgramPID(i));
+    }
 }
 
 void SIScan::HandleVCT(uint, const VirtualChannelTable*)
@@ -361 +364 @@
                                   bool wait_until_complete)
 {
     const DVBStreamData &dsd = (const DVBStreamData &)(*sd);
-    if (wait_until_complete && !dsd.HasCachedSDT())
+    if (wait_until_complete && !dsd.HasCachedSDT() && !dsd.HasCachedAllNIT())
         return;
 
     emit ServiceScanUpdateText(tr("Updating Services"));