From: Adam Sutton <dev@adamsutton.me.uk>
Date: Thu, 21 Feb 2013 14:33:32 +0000 (+0000)
Subject: ui: fix previous mod that broken channel configuration editing
X-Git-Tag: v3.9~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f44baad54c467353bf293f1f622e43c8e1ad9807;p=thirdparty%2Ftvheadend.git

ui: fix previous mod that broken channel configuration editing

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.
---

diff --git a/src/webui/extjs.c b/src/webui/extjs.c
index 55c30a288..4d365f81b 100644
--- a/src/webui/extjs.c
+++ b/src/webui/extjs.c
@@ -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) {