From 56196d31b09f11824bce65d2ec51d626754cc864 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 11 Jun 2014 12:24:47 +0200 Subject: [PATCH] mpegts_network: Fix the crash on shutdown (accessing registered but freed timer) --- src/input/mpegts/mpegts_network.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c index dd47a4cd..fa38af62 100644 --- a/src/input/mpegts/mpegts_network.c +++ b/src/input/mpegts/mpegts_network.c @@ -245,9 +245,6 @@ mpegts_network_delete mpegts_mux_t *mm; mpegts_network_link_t *mnl; - /* Disarm scanning */ - gtimer_disarm(&mn->mn_scan_timer); - /* Remove from global list */ LIST_REMOVE(mn, mn_global_link); @@ -256,6 +253,9 @@ mpegts_network_delete mm->mm_delete(mm, delconf); } + /* Disarm scanning */ + gtimer_disarm(&mn->mn_scan_timer); + /* Remove from input */ while ((mnl = LIST_FIRST(&mn->mn_inputs))) mpegts_network_link_delete(mnl);