mpegts: correct logic for DVB_TYPE (tvhdhomerun)

tvheadend · Nov 11, 2015 · 4dd5f71 · 4dd5f71
1 parent e9a7b3c
commit 4dd5f71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/input/mpegts/mpegts_network_dvb.c b/src/input/mpegts/mpegts_network_dvb.c
@@ -605,6 +605,7 @@ dvb_network_create0
 
   ln = calloc(1, sizeof(dvb_network_t));
   ln->ln_type = dvb_fe_type_by_network_class(idc);
+  assert(ln->ln_type != DVB_TYPE_NONE);
 
   /* Create */
   if (!(ln = (dvb_network_t*)mpegts_network_create0((void*)ln,

diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
@@ -622,7 +622,7 @@ tvhdhomerun_frontend_create(tvhdhomerun_device_t *hd, struct hdhomerun_discover_
     uuid = htsmsg_get_str(conf, "uuid");
 
   /* Class */
-  if (!(idc = dvb_network_class_by_fe_type(type))) {
+  if (!(idc = dvb_network_class_by_fe_type(type)) || type == DVB_TYPE_S) {
     tvherror("tvhdhomerun", "unknown FE type %d", type);
     return NULL;
   }