Merge "astobj2: Fix shutdown order." into 15

8 years ago · 0298f4eb0c
parent 386bda4ab0 427c3e3152
commit 0298f4eb0c
1 changed files with 3 additions and 2 deletions
--- a/main/astobj2.c
+++ b/main/astobj2.c
@ -1193,8 +1193,11 @@ int astobj2_init(void)
 		}
 	}

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

@ -1202,7 +1205,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;
 }