]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
ui: fix previous mod that broken channel configuration editing
authorAdam Sutton <dev@adamsutton.me.uk>
Thu, 21 Feb 2013 14:33:32 +0000 (14:33 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Thu, 21 Feb 2013 14:33:32 +0000 (14:33 +0000)
I made the change so that /channels returned the imagecache icon
while I was testing some other UI code. Unfortunately that breaks
channel editing. So I've added a second (possibly confusingly named)
field.

src/webui/extjs.c

index 55c30a288d02c27c0be68cdf0a57c85a58239e37..4d365f81b2f1ed657fb3d6a3f25ceee25702b861 100644 (file)
@@ -422,8 +422,10 @@ build_record_channel ( channel_t *ch )
   htsmsg_add_str(c, "name", ch->ch_name);
   htsmsg_add_u32(c, "chid", ch->ch_id);
 
-  if(ch->ch_icon != NULL)
-    htsmsg_add_imageurl(c, "ch_icon", "imagecache/%d", ch->ch_icon);
+  if(ch->ch_icon != NULL) {
+    htsmsg_add_imageurl(c, "chicon", "imagecache/%d", ch->ch_icon);
+    htsmsg_add_str(c, "ch_icon", ch->ch_icon);
+  }
 
   buf[0] = 0;
   LIST_FOREACH(ctm, &ch->ch_ctms, ctm_channel_link) {