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

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



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@374106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2012-10-01 16:12:43 +00:00
parent 30d590a970
commit 17aa64c20e

View File

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