From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 30 Sep 2016 07:36:13 +0000 (+0200)
Subject: iptv auto: cleanups, fix mux name
X-Git-Tag: v4.2.1~297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72b014cdd2602ef748a61b5885be82b251163865;p=thirdparty%2Ftvheadend.git

iptv auto: cleanups, fix mux name
---

diff --git a/src/input/mpegts/iptv/iptv_auto.c b/src/input/mpegts/iptv/iptv_auto.c
index e0b8d964e..6a33cac9e 100644
--- a/src/input/mpegts/iptv/iptv_auto.c
+++ b/src/input/mpegts/iptv/iptv_auto.c
@@ -194,7 +194,10 @@ iptv_auto_network_process_m3u_item(iptv_network_t *in,
 
 skip_url:
   if (last_url) {
-    snprintf(n = name2, sizeof(name2), "%s - %s", last_url, name);
+    if (name[0])
+      snprintf(n = name2, sizeof(name2), "%s - %s", last_url, name);
+    else
+      n = (char *)last_url;
   } else {
     n = (char *)name;
   }
@@ -203,7 +206,7 @@ skip_url:
     im = (iptv_mux_t *)mm;
     if (strcmp(im->mm_iptv_url ?: "", url) == 0) {
       im->im_delete_flag = 0;
-      if (strcmp(im->mm_iptv_svcname ?: "", name ?: "")) {
+      if (strcmp(im->mm_iptv_svcname ?: "", name)) {
         free(im->mm_iptv_svcname);
         im->mm_iptv_svcname = strdup(name);
         change = 1;