[Asterisk-cvs] asterisk/channels chan_h323.c,1.11,1.12

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv22027

Modified Files:
	chan_h323.c 
Log Message:
stomp on seg if no config file


Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- chan_h323.c	9 Dec 2003 05:14:23 -0000	1.11
+++ chan_h323.c	10 Dec 2003 23:34:47 -0000	1.12
@@ -1410,6 +1410,9 @@
 		return 1;
 	}
 	
+       /* fire up the H.323 Endpoint */
+        h323_end_point_create();        
+
 	h323debug=0;
 	dtmfmode = H323_DTMF_RFC2833;
 
@@ -1718,12 +1721,12 @@
 {
 	int res;
 
-	/* fire up the H.323 Endpoint */ 
-	h323_end_point_create();
-
 	res = reload_config();
-	if (!res) {
-	/* Make sure we can register our channel type */
+
+	if (res) {
+		return 0;
+	} else {
+		/* Make sure we can register our channel type */
 		if (ast_channel_register(type, tdesc, capability, oh323_request)) {
 			ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
 			h323_end_process();
@@ -1774,8 +1777,6 @@
 		}
 		/* And start the monitor for the first time */
 		restart_monitor();
-	} else {
-		h323_end_process();
 	}
 	return res;
 }