From 7d9e7ff5d428c0cbccffba545418844b66dcf449 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Mon, 3 Aug 2009 08:05:23 +0000 Subject: [PATCH] tda_adapter may be NULL --- src/dvb/dvb_adapter.c | 3 ++- src/dvb/dvb_transport.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c index 2cbfc610..5bba7044 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 d2ace30b..ca7720e5 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);