From: Andreas Öman <andreas@lonelycoder.com>
Date: Mon, 3 Aug 2009 08:05:23 +0000 (+0000)
Subject: tda_adapter may be NULL
X-Git-Tag: 2.12~548
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d9e7ff5d428c0cbccffba545418844b66dcf449;p=thirdparty%2Ftvheadend.git

tda_adapter may be NULL
---

diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index 2cbfc6102..5bba7044e 100644
--- 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 d2ace30b2..ca7720e54 100644
--- 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);