epg: fix _epg_broadcast_updated for event without assigned channel, f…

…ixes #3251
tvheadend · Nov 2, 2015 · a5e1cf5 · a5e1cf5
1 parent e2d8fe0
commit a5e1cf5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/channels.c b/src/channels.c
@@ -937,8 +937,9 @@ channel_delete ( channel_t *ch, int delconf )
 void
 channel_save ( channel_t *ch )
 {
-  htsmsg_t *c = htsmsg_create_map();
+  htsmsg_t *c;
   if (ch->ch_dont_save == 0) {
+    c = htsmsg_create_map();
     idnode_save(&ch->ch_id, c);
     hts_settings_save(c, "channel/config/%s", idnode_uuid_as_sstr(&ch->ch_id));
     htsmsg_destroy(c);

diff --git a/src/download.c b/src/download.c
@@ -208,8 +208,10 @@ download_start( download_t *dn, const char *url, void *aux )
     http_client_close(dn->http_client);
     dn->http_client = NULL;
   }
-  if (url)
+  if (url) {
+    free(dn->url);
     dn->url = strdup(url);
+  }
   dn->aux = aux;
   gtimer_arm(&dn->fetch_timer, download_fetch, dn, 0);
 }

diff --git a/src/epg.c b/src/epg.c
@@ -1607,9 +1607,11 @@ static void _epg_broadcast_updated ( void *eo )
     htsp_event_add(eo);
     notify_delayed(id, "epg", "create");
   }
-  dvr_event_updated(eo);
-  dvr_autorec_check_event(eo);
-  channel_event_updated(eo);
+  if (ebc->channel) {
+    dvr_event_updated(eo);
+    dvr_autorec_check_event(eo);
+    channel_event_updated(eo);
+  }
 }
 
 static epg_broadcast_t **_epg_broadcast_skel ( void )