From: Jaroslav Kysela <perex@perex.cz>
Date: Sun, 13 Aug 2017 11:44:52 +0000 (+0200)
Subject: channels: get_icon - chicon - join the behaviour for slash and backslash
X-Git-Tag: v4.2.4~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d7585986bb7dfc51d9390c5723ecb6d2397e5f2;p=thirdparty%2Ftvheadend.git

channels: get_icon - chicon - join the behaviour for slash and backslash
---

diff --git a/src/channels.c b/src/channels.c
index c702f1b49..eabe13453 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -850,7 +850,7 @@ channel_get_icon ( channel_t *ch )
           s = sname;
           while (s && *s) {
             c = *s;
-            if (c > 122 || strchr("/:\\<>|*?'\"", c) != NULL)
+            if (c > 122 || strchr(":<>|*?'\"", c) != NULL)
               *(char *)s = '_';
             else if (config.chicon_scheme == CHICON_LOWERCASE && c >= 'A' && c <= 'Z')
               *(char *)s = c - 'A' + 'a';
@@ -894,7 +894,7 @@ channel_get_icon ( channel_t *ch )
         for (s = sname; *s == '.'; s++)
           *(char *)s = '_';
 
-        for (s = sname; *s; s++)
+        for ( ; *s; s++)
           if (*s == '/' || *s == '\\')
             *(char *)s = '-';
           else if (*s < ' ')
@@ -906,6 +906,7 @@ channel_get_icon ( channel_t *ch )
       }
 
       snprintf(buf, sizeof(buf), "%s%s%s", chi, sname ?: "", send ?: "");
+
       free((char *)sname);
       free((char *)send);
       free((char *)chi);