From: Jaroslav Kysela <perex@perex.cz>
Date: Tue, 20 Jun 2017 15:00:48 +0000 (+0200)
Subject: linuxdvb: fix the adapter active flag, fixes #4452
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=482052a3dd700ec5b17bf5d85cd6636b658b4aac;p=thirdparty%2Ftvheadend.git

linuxdvb: fix the adapter active flag, fixes #4452
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
index 0cbec5ce4..8d0f49ba0 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_frontend.c
@@ -83,13 +83,6 @@ const idclass_t linuxdvb_frontend_class =
   .ic_doc        = tvh_doc_linuxdvb_frontend_class,
   .ic_changed    = linuxdvb_frontend_class_changed,
   .ic_properties = (const property_t[]) {
-    {
-      .type     = PT_BOOL,
-      .id       = "active",
-      .name     = N_("Active"),
-      .opts     = PO_RDONLY | PO_NOSAVE | PO_NOUI,
-      .get      = linuxdvb_frontend_class_active_get,
-    },
     {
       .type     = PT_STR,
       .id       = "fe_path",
diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index 175a27aa1..6afd06277 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -71,7 +71,7 @@ mpegts_input_class_active_get ( void *obj )
 {
   static int active;
   mpegts_input_t *mi = obj;
-  active = mi->mi_is_enabled((mpegts_input_t*)mi, NULL, 0, -1) != MI_IS_ENABLED_NEVER;
+  active = mi->mi_enabled ? 1 : 0;
   return &active;
 }