]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
Fix user facing transport names for IPTV
authorAndreas Öman <andreas@lonelycoder.com>
Wed, 30 Jun 2010 19:03:09 +0000 (19:03 +0000)
committerAndreas Öman <andreas@lonelycoder.com>
Wed, 30 Jun 2010 19:03:09 +0000 (19:03 +0000)
src/iptv_input.c
src/transports.c

index ef7ae1431a25dcd465f32ed5d69076e3833d5087..b8297913e848bfdcdc812ac0a597de42a8007cf5 100644 (file)
@@ -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);
     
index dceb446be9cd1c524c66ff32881617e8ae186543..b4a90e7852910aba1a5e5d0382b8cc376bf57c2f 100644 (file)
@@ -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);