stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

mpegts network_scan: fix problem with active muxes being re-added to scan Q

Browse source
This commit is contained in:
Adam Sutton 2014-06-11 01:02:22 +01:00
parent 626d2f01d7
commit e2b91b3e37
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/input/mpegts/mpegts_mux.c
View file

@ -661,6 +661,9 @@ mpegts_mux_stop ( mpegts_mux_t *mm, int force )
/* Scanning */
mpegts_network_scan_mux_cancel(mm, 1);
if (mm->mm_scan_state == MM_SCAN_STATE_IDLE &&
mm->mm_network->mn_idlescan)
mpegts_network_scan_queue_add(mm, SUBSCRIPTION_PRIO_SCAN_IDLE);
/* Events */
mpegts_fire_event(mm, ml_mux_stop);

2
src/input/mpegts/mpegts_network_scan.c
View file

@ -124,8 +124,6 @@ mpegts_network_scan_mux_done0
}
/* Re-enable? */
if (mm->mm_network->mn_idlescan && !weight)
weight = SUBSCRIPTION_PRIO_SCAN_IDLE;
if (weight > 0)
mpegts_network_scan_queue_add(mm, weight);
}