[asterisk-commits] file: branch 1.6.1 r218297 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Sep 14 13:17:36 2009
New Revision: 218297

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218297
Log:
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.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/features.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/features.c?view=diff&rev=218297&r1=218296&r2=218297
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Mon Sep 14 13:17:36 2009
@@ -3557,7 +3557,7 @@
 	}
 
 	/* 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;