From 6e7b0ff8a2485b952351e40fa9541ecfa24a548f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96man?= Date: Wed, 30 Jun 2010 19:03:09 +0000 Subject: [PATCH] Fix user facing transport names for IPTV --- src/iptv_input.c | 1 + src/transports.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/iptv_input.c b/src/iptv_input.c index ef7ae143..b8297913 100644 --- a/src/iptv_input.c +++ b/src/iptv_input.c @@ -460,6 +460,7 @@ iptv_transport_load(void) t->tht_iptv_port = u32; pthread_mutex_lock(&t->tht_stream_mutex); + transport_make_nicename(t); psi_load_transport_settings(c, t); pthread_mutex_unlock(&t->tht_stream_mutex); diff --git a/src/transports.c b/src/transports.c index dceb446b..b4a90e78 100644 --- a/src/transports.c +++ b/src/transports.c @@ -566,8 +566,8 @@ transport_make_nicename(th_transport_t *t) snprintf(buf, sizeof(buf), "%s%s%s%s%s", - si.si_adapter ?: "", si.si_adapter ? "/" : "", - si.si_mux ?: "", si.si_mux ? "/" : "", + si.si_adapter ?: "", si.si_adapter && si.si_mux ? "/" : "", + si.si_mux ?: "", si.si_mux && si.si_service ? "/" : "", si.si_service ?: ""); transport_source_info_free(&si);