Merge "astobj2: Fix shutdown order." into 13

7 years ago · 69660f3c9a
parent 921c8589ef 1f5c2a2d0d
commit 69660f3c9a
1 changed files with 3 additions and 2 deletions
--- a/main/astobj2.c
+++ b/main/astobj2.c
@ -887,8 +887,11 @@ int astobj2_init(void)
 	}
 #endif

+	ast_register_cleanup(astobj2_cleanup);
+
 	if (container_init() != 0) {
 		fclose(ref_log);
+		ref_log = NULL;
 		return -1;
 	}

@ -896,7 +899,5 @@ int astobj2_init(void)
 	ast_cli_register_multiple(cli_astobj2, ARRAY_LEN(cli_astobj2));
 #endif	/* defined(AO2_DEBUG) */

-	ast_register_cleanup(astobj2_cleanup);
-
 	return 0;
 }