From: Jaroslav Kysela Date: Sun, 10 Apr 2016 18:47:47 +0000 (+0200) Subject: hdhomerun: fix tvhdhomerun_frontend_delete() shutdown sequence X-Git-Tag: v4.2.1~690 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7de84304d3f978fa565fbbdc44a0c9de642c2b5b;p=thirdparty%2Ftvheadend.git hdhomerun: fix tvhdhomerun_frontend_delete() shutdown sequence --- diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c index f8b10afd9..b9a741f88 100644 --- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c +++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c @@ -650,14 +650,14 @@ tvhdhomerun_frontend_delete ( tvhdhomerun_frontend_t *hfe ) { lock_assert(&global_lock); + /* Ensure we're stopped */ + mpegts_input_stop_all((mpegts_input_t*)hfe); + mtimer_disarm(&hfe->hf_monitor_timer); hdhomerun_device_tuner_lockkey_release(hfe->hf_hdhomerun_tuner); hdhomerun_device_destroy(hfe->hf_hdhomerun_tuner); - /* Ensure we're stopped */ - mpegts_input_stop_all((mpegts_input_t*)hfe); - /* Remove from adapter */ TAILQ_REMOVE(&hfe->hf_device->hd_frontends, hfe, hf_link);