From 2b909f2601324336c78ba00904b47da2e9ba14bf Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 7 Nov 2014 12:09:53 +0100 Subject: [PATCH] bouquet: fix rescan for the enabled bouquet --- src/bouquet.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/bouquet.c b/src/bouquet.c index b0840f73..0a8a9fa7 100644 --- a/src/bouquet.c +++ b/src/bouquet.c @@ -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); }