Merge "config: Fix locking for extconfig reload."

8 years ago · fd353237f0
parent c1d523c7b3 e03f0f9572
commit fd353237f0
1 changed files with 1 additions and 2 deletions
--- a/main/config.c
+++ b/main/config.c
@ -2839,8 +2839,6 @@ static void clear_config_maps(void)
 {
 	struct ast_config_map *map;

-	SCOPED_MUTEX(lock, &config_lock);
-
 	while (config_maps) {
 		map = config_maps;
 		config_maps = config_maps->next;
@ -2894,6 +2892,7 @@ int read_config_maps(void)
 	char *driver, *table, *database, *textpri, *stringp, *tmp;
 	struct ast_flags flags = { CONFIG_FLAG_NOREALTIME };
 	int pri;
+	SCOPED_MUTEX(lock, &config_lock);

 	clear_config_maps();