From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 19 Dec 2012 20:46:35 +0000 (+0000)
Subject: Issue #1403 - ensure adapter config is properly loaded.
X-Git-Tag: v3.5~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87f6f582157e25ff0a32b7aca9364acd483ce771;p=thirdparty%2Ftvheadend.git

Issue #1403 - ensure adapter config is properly loaded.
---

diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c
index ca8729e20..21b9cab64 100644
--- a/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@ -482,10 +482,7 @@ tda_add(int adapter_num)
     free(tda);
     return;
   }
-  if (tda->tda_idlescan || !tda->tda_idleclose)
-    tda->tda_fe_fd = fe;
-  else
-    close(fe);
+  tda->tda_fe_fd = fe;
 
   tda->tda_type = tda->tda_fe_info->type;
 
@@ -709,6 +706,10 @@ dvb_adapter_init(uint32_t adapter_mask, const char *rawfile)
 
   TAILQ_FOREACH(tda, &dvb_adapters, tda_global_link) {
     tda_init_input(tda);
+    if (tda->tda_idlescan || !tda->tda_idleclose) {
+      close(tda->tda_fe_fd);
+      tda->tda_fe_fd = -1;
+    }
 
     if(tda->tda_sat)
       dvb_satconf_init(tda);