tda_adapter may be NULL

This commit is contained in:
Andreas Öman 2009-08-03 08:05:23 +00:00
parent c02234c584
commit 7d9e7ff5d4
2 changed files with 4 additions and 2 deletions

View file

@ -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

View file

@ -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);