stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

channel: icons - do not generate auto icon URL with {name-not-set}, fixes #2661

Browse source
This commit is contained in:
Jaroslav Kysela 2015-02-10 09:41:28 +01:00
parent 4a9dfec70f
commit 77d947fe57
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/channels.c
View file

@ -45,6 +45,8 @@
#include "bouquet.h"
#include "intlconv.h"
#define CHANNEL_BLANK_NAME "{name-not-set}"
struct channel_tree channels;
struct channel_tag_queue channel_tags;
@ -575,7 +577,7 @@ channel_set_tags_by_list ( channel_t *ch, htsmsg_t *tags )
const char *
channel_get_name ( channel_t *ch )
{
static const char *blank = "{name-not-set}";
static const char *blank = CHANNEL_BLANK_NAME;
const char *s;
channel_service_mapping_t *csm;
if (ch->ch_name && *ch->ch_name) return ch->ch_name;
@ -642,7 +644,8 @@ channel_get_icon ( channel_t *ch )
/* No user icon - try to get the channel icon by name */
if (!pick && chicon && chicon[0] >= ' ' && chicon[0] <= 122 &&
(chname = channel_get_name(ch)) != NULL && chname[0]) {
(chname = channel_get_name(ch)) != NULL && chname[0] &&
strcmp(chname, CHANNEL_BLANK_NAME)) {
const char *chi, *send, *sname, *s;
chi = strdup(chicon);