]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
bouquet: fix rescan for the enabled bouquet
authorJaroslav Kysela <perex@perex.cz>
Fri, 7 Nov 2014 11:09:53 +0000 (12:09 +0100)
committerJaroslav Kysela <perex@perex.cz>
Sat, 8 Nov 2014 20:05:39 +0000 (21:05 +0100)
src/bouquet.c

index b0840f7363f17a7ae43d135c0ae6aa321fddd920..0a8a9fa7002c80861a34b37ec6a5319ceb276064 100644 (file)
@@ -540,14 +540,20 @@ bouquet_class_get_list(void *o)
 }
 
 static void
-bouquet_class_rescan_notify ( void *obj )
+bouquet_class_rescan_notify0 ( bouquet_t *bq )
 {
   void mpegts_mux_bouquet_rescan ( const char *src, const char *extra );
+  mpegts_mux_bouquet_rescan(bq->bq_src, bq->bq_comment);
+  bq->bq_rescan = 0;
+}
+
+static void
+bouquet_class_rescan_notify ( void *obj )
+{
   bouquet_t *bq = obj;
 
   if (bq->bq_rescan)
-    mpegts_mux_bouquet_rescan(bq->bq_src, bq->bq_comment);
-  bq->bq_rescan = 0;
+    bouquet_class_rescan_notify0(bq);
 }
 
 static void
@@ -556,7 +562,7 @@ bouquet_class_enabled_notify ( void *obj )
   bouquet_t *bq = obj;
 
   if (bq->bq_enabled)
-    bouquet_class_rescan_notify(obj);
+    bouquet_class_rescan_notify0(bq);
   bouquet_map_to_channels(bq);
 }