scanfile_init: fix mutex locking - fixes #4033

tvheadend · Oct 22, 2016 · c003ff3 · c003ff3 · ksooo · Oct 23, 2016
1 parent a54db94
commit c003ff3
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;