epggrab: do not re-enable opentv grabber when user not enabled it, fixes #4633

diff --git a/src/epggrab/channel.c b/src/epggrab/channel.c
index 8f6a352a03643129561e0b387ef37e4896b86530..09cf332b2159bca3c1b258444c44771f9c782239 100644 (file)
--- 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);
@@ -625,7 +625,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 b5978c264b804489f7aa9feb76dd46ee58c1e67a..95eb796fd900297ae20fc1b2e5ab14dbe5579e9e 100644 (file)
--- a/src/epggrab/module/opentv.c
+++ b/src/epggrab/module/opentv.c
@@ -525,7 +525,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);
     }