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 f8e1675a559809a4fd33c38e08652f0238fcb102..4264ceda05c357f3d2b233c5e5a0f0448c81f6c5 100644 (file)
--- 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)
 {