SAT>IP Client: do not save config in the load procedure

tvheadend · Apr 23, 2015 · 706beee · 706beee
1 parent 8cb63d9
commit 706beee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
@@ -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);
 

diff --git a/src/input/mpegts/satip/satip_private.h b/src/input/mpegts/satip/satip_private.h
@@ -62,6 +62,7 @@ struct satip_device
   tvh_hardware_t;
 
   gtimer_t                   sd_destroy_timer;
+  int                        sd_nosave;
 
   /*
    * Adapter info