[svn-commits] oej: branch oej/codename-pineapple r48133 - in /team/oej/codename-pineapple: ...

[svn-commits at lists.digium.com]

Author: oej
Date: Thu Nov 30 07:19:06 2006
New Revision: 48133

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48133
Log:
Update

Modified:
    team/oej/codename-pineapple/agi/Makefile
    team/oej/codename-pineapple/channels/chan_sip3.c

Modified: team/oej/codename-pineapple/agi/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/agi/Makefile?view=diff&rev=48133&r1=48132&r2=48133
==============================================================================
--- team/oej/codename-pineapple/agi/Makefile (original)
+++ team/oej/codename-pineapple/agi/Makefile Thu Nov 30 07:19:06 2006
@@ -21,7 +21,7 @@
 
 include $(ASTTOPDIR)/Makefile.rules
 
-all: $(AGIS)
+#all: $(AGIS)
 
 strcompat.c: ../main/strcompat.c
 	@cp $< $@

Modified: team/oej/codename-pineapple/channels/chan_sip3.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/chan_sip3.c?view=diff&rev=48133&r1=48132&r2=48133
==============================================================================
--- team/oej/codename-pineapple/channels/chan_sip3.c (original)
+++ team/oej/codename-pineapple/channels/chan_sip3.c Thu Nov 30 07:19:06 2006
@@ -7101,8 +7101,11 @@
 
 	sip_reloadreason = CHANNEL_MODULE_LOAD;
 
-	if(reload_config(sip_reloadreason))	/* Load the configuration from sip.conf */
+	if(reload_config(sip_reloadreason)) {	/* Load the configuration from sip.conf */
+		io_context_destroy(io);
+		sched_context_destroy(sched);
 		return AST_MODULE_LOAD_DECLINE;
+	}
 
 	logdebug(4, "SIP3 :: Configuration loaded\n");