From c003ff3bf9be8a59c65f41a74dce6bd42ab2e154 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 22 Oct 2016 21:09:20 +0200 Subject: [PATCH] scanfile_init: fix mutex locking - fixes #4033 --- src/input/mpegts/scanfile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/input/mpegts/scanfile.c b/src/input/mpegts/scanfile.c index d02d11841..119e2fcc3 100644 --- a/src/input/mpegts/scanfile.c +++ b/src/input/mpegts/scanfile.c @@ -906,8 +906,12 @@ scanfile_init ( const char *muxconf_path, int lock ) #endif if (!initialized) { + if (lock) + pthread_mutex_lock(&global_lock); memoryinfo_register(&scanfile_memoryinfo); initialized = 1; + if (lock) + pthread_mutex_lock(&global_lock); } scanfile_total_load = 0; -- 2.47.3