tda_adapter may be NULL

diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index 2cbfc61023be0305f570baede2bee1b7d0897fb6..5bba7044ee966a44f8b4f049256a048cd67086e7 100644 (file)
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@ -520,7 +520,8 @@ dvb_adapter_build_msg(th_dvb_adapter_t *tda)
 
   htsmsg_add_str(m, "identifier", tda->tda_identifier);
   htsmsg_add_str(m, "name", tda->tda_displayname);
-  htsmsg_add_str(m, "path", tda->tda_rootpath);
+  if(tda->tda_rootpath != NULL)
+    htsmsg_add_str(m, "path", tda->tda_rootpath);
   htsmsg_add_str(m, "devicename", tda->tda_fe_info->name);
 
   // XXX: bad bad bad slow slow slow

diff --git a/src/dvb/dvb_transport.c b/src/dvb/dvb_transport.c
index d2ace30b279f04504194182dba60b5752ddd8fba..ca7720e54f3db4393acac6c12a927955ff64f2e7 100644 (file)
--- a/src/dvb/dvb_transport.c
+++ b/src/dvb/dvb_transport.c
@@ -298,7 +298,8 @@ dvb_transport_sourceinfo(th_transport_t *t)
 
   lock_assert(&global_lock);
 
-  htsmsg_add_str(m, "device", tdmi->tdmi_adapter->tda_rootpath);
+  if(tdmi->tdmi_adapter->tda_rootpath  != NULL)
+    htsmsg_add_str(m, "device", tdmi->tdmi_adapter->tda_rootpath);
 
   htsmsg_add_str(m, "adapter", tdmi->tdmi_adapter->tda_displayname);