From b9038df4b8fe7c49df17f9789a9ba1ac6dc42999 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 29 Sep 2017 14:11:47 +0200 Subject: [PATCH] epggrab: do not re-enable opentv grabber when user not enabled it, fixes #4633 --- src/epggrab/channel.c | 4 ++-- src/epggrab/module/opentv.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/epggrab/channel.c b/src/epggrab/channel.c index 551675744..7bbed9751 100644 --- a/src/epggrab/channel.c +++ b/src/epggrab/channel.c @@ -410,7 +410,7 @@ void epggrab_channel_destroy( epggrab_channel_t *ec, int delconf, int rb_remove idnode_save_check(&ec->idnode, delconf); /* Already linked */ - epggrab_channel_links_delete(ec, 0); + epggrab_channel_links_delete(ec, 1); if (rb_remove) RB_REMOVE(&ec->mod->channels, ec, link); TAILQ_REMOVE(&epggrab_channel_entries, ec, all_link); @@ -624,7 +624,7 @@ epggrab_channel_class_enabled_notify ( void *obj, const char *lang ) { epggrab_channel_t *ec = obj; if (!ec->enabled) { - epggrab_channel_links_delete(ec, 0); + epggrab_channel_links_delete(ec, 1); } else { epggrab_channel_updated(ec); } diff --git a/src/epggrab/module/opentv.c b/src/epggrab/module/opentv.c index 6abf06f51..973dbd957 100644 --- a/src/epggrab/module/opentv.c +++ b/src/epggrab/module/opentv.c @@ -555,7 +555,7 @@ skip_chnum: ilm = NULL; } - if (!ilm) + if (!ilm && ec->enabled) epggrab_channel_link(ec, ch, NULL); save |= epggrab_channel_set_number(ec, cnum, 0); } -- 2.47.2