diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 18:17:36 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-14 18:17:36 +0000 |
| commit | d9f7c2775aba291abe62c9556660c75233165d1b (patch) | |
| tree | 8e8748158cb8db34627bc4c0ed477b3a2f81bbeb /main | |
| parent | 9bf8856f3fa2b9ea204d69209aa23725f61d2079 (diff) | |
Merged revisions 218295 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r218295 | file | 2009-09-14 13:16:39 -0500 (Mon, 14 Sep 2009) | 2 lines
Do not attempt to add a parking extension if an error occurred while reading the configuration.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@218297 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index d987db4c9..3378eef0d 100644 --- a/main/features.c +++ b/main/features.c @@ -3557,7 +3557,7 @@ static struct ast_parkinglot *build_parkinglot(char *name, struct ast_variable * } /* Add a parking extension into the context */ - if (!oldparkinglot) { + if (!error && !oldparkinglot) { if (!ast_strlen_zero(ast_parking_ext())) { if (ast_add_extension2(con, 1, ast_parking_ext(), 1, NULL, NULL, parkcall, strdup(""), ast_free_ptr, registrar) == -1) error = 1; |