Ticket #12848: 07_chanid.diff

libs/libmythtv/channelscan/channelscan_sm.cpp

@@ -1362 +1362 @@
         if ((info.si_standard == "mpeg") ||
             (info.si_standard == "scte") ||
             (info.si_standard == "opencable"))
-            info.chan_num = QString("%1-%2")
-                              .arg(info.freqid)
-                              .arg(info.service_id);
+           {
+                if (info.freqid.length() > 0)
+                    info.chan_num = QString("%1-%2")
+                                   .arg(info.freqid)
+                                   .arg(info.service_id);
+                else
+                    info.chan_num = QString("%1")
+                                  .arg(info.service_id);
+           }
     }
 
     // Check for decryption success