From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 22 Oct 2016 19:09:20 +0000 (+0200)
Subject: scanfile_init: fix mutex locking - fixes #4033
X-Git-Tag: v4.2.1~246
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c003ff3bf9be8a59c65f41a74dce6bd42ab2e154;p=thirdparty%2Ftvheadend.git

scanfile_init: fix mutex locking - fixes #4033
---

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;