]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
SAT>IP Client: do not save config in the load procedure
authorJaroslav Kysela <perex@perex.cz>
Thu, 23 Apr 2015 14:53:31 +0000 (16:53 +0200)
committerJaroslav Kysela <perex@perex.cz>
Thu, 23 Apr 2015 14:53:31 +0000 (16:53 +0200)
src/input/mpegts/satip/satip.c
src/input/mpegts/satip/satip_private.h

index 0d9a8adff15a7f0afdb34f411f4ab514771b4e05..b0fc4a43c87515d0461a942833d847cd5f8fbea9 100644 (file)
@@ -494,9 +494,11 @@ satip_device_create( satip_device_info_t *info )
       tvhlog(LOG_ERR, "satip", "%s: bad tuner count [%s]",
              satip_device_nicename(sd, buf2, sizeof(buf2)), argv[i]);
     } else {
+      sd->sd_nosave = 1;
       for (j = 0; j < m; j++)
         if (satip_frontend_create(feconf, sd, type, v2, fenum))
           fenum++;
+      sd->sd_nosave = 0;
     }
   }
 
@@ -544,6 +546,9 @@ satip_device_save( satip_device_t *sd )
   satip_frontend_t *lfe;
   htsmsg_t *m, *l;
 
+  if (sd->sd_nosave)
+    return;
+
   m = htsmsg_create_map();
   idnode_save(&sd->th_id, m);
 
index b7e83fdde5cbd50fc74ea78b5fa3a4edaa136126..5880fdd5e4870692d7ee5ad9dea7f28fbe87b597 100644 (file)
@@ -62,6 +62,7 @@ struct satip_device
   tvh_hardware_t;
 
   gtimer_t                   sd_destroy_timer;
+  int                        sd_nosave;
 
   /*
    * Adapter info