From: Joshua Colp <jcolp@digium.com>
Date: Mon, 14 Sep 2009 18:17:36 +0000 (+0000)
Subject: Merged revisions 218295 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59fe8ebbc1e9cce4ffff22be640e0ead1b154519;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@218297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index d987db4c94..3378eef0d9 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;