kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 20:56:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't destroy confbridge config when error is encountered during a reload.

Browse Source 
Not panicking means that the old config is kept.

(closes issue ASTERISK-20458)
Reported by: Leif Madsen
Patches:
	ASTERISK-20458.patch uploaded by Mark Michelson(license #5049)
Tested by Leif Madsen
........

Merged revisions 374106 from http://svn.asterisk.org/svn/asterisk/branches/11


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2012-10-01 16:26:23 +00:00
parent 0fc114dc65
commit d819508bae
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/confbridge/conf_config_parser.c
View File

@@ -1316,7 +1316,10 @@ int conf_load_config(int reload)
return 0; return 0;
error: error:
conf_destroy_config(); /* On a reload, just keep the config we already have in place. */
if (!reload) {
conf_destroy_config();
}
return -1; return -1;
} }