Redo fix for service primary epg prio check.

This commit is contained in:
Adam Sutton 2012-10-12 13:14:17 +01:00
parent 57ae0b32a9
commit 4a10fbfe8f

View file

@ -1163,7 +1163,7 @@ service_is_primary_epg(service_t *svc)
LIST_FOREACH(t, &svc->s_ch->ch_services, s_ch_link) { LIST_FOREACH(t, &svc->s_ch->ch_services, s_ch_link) {
if (!t->s_dvb_mux_instance) continue; if (!t->s_dvb_mux_instance) continue;
if (!t->s_enabled || !t->s_dvb_eit_enable) continue; if (!t->s_enabled || !t->s_dvb_eit_enable) continue;
if (!ret || dvb_extra_prio(t->s_dvb_mux_instance->tdmi_adapter) > dvb_extra_prio(ret->s_dvb_mux_instance->tdmi_adapter)) if (!ret || service_get_prio(t) < service_get_prio(ret))
ret = t; ret = t;
} }
return !ret ? 0 : (ret->s_dvb_service_id == svc->s_dvb_service_id); return !ret ? 0 : (ret->s_dvb_service_id == svc->s_dvb_service_id);