From: Automerge script Date: Sat, 21 Oct 2006 13:01:41 +0000 (+0000) Subject: automerge commit X-Git-Tag: 1.2.14-netsec~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab1188c1f2f3d17cb1fd79415d0d73d120a9fb51;p=thirdparty%2Fasterisk.git automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45814 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index f8e1675a55..4264ceda05 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -64,6 +64,7 @@ char global_tracefile[BUFFERSIZE+1]; +static int g_config_initialized=0; struct misdn_jb{ int size; @@ -706,6 +707,11 @@ static char *misdn_get_ch_state(struct chan_list *p) static void reload_config(void) { int i, cfg_debug; + + if (!g_config_initialized) { + ast_log(LOG_WARNING, "chan_misdn is not initialized properly, still reloading ?\n"); + return ; + } free_robin_list(); misdn_cfg_reload(); @@ -4091,7 +4097,6 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data) *******************************************/ -static int g_config_initialized=0; int load_module(void) {