automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@70675 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · f64c485a1c
parent 4a623ce514
commit f64c485a1c
2 changed files with 2 additions and 1 deletions
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@ -4997,7 +4997,6 @@ static int misdn_set_opt_exec(struct ast_channel *chan, void *data)
 				chan_misdn_log(1, ch->bc->port, "SETOPT: HDLC \n");
 				if (!ch->bc->hdlc) {
 					ch->bc->hdlc=1;
-					misdn_lib_setup_bc(ch->bc);
 				}
 			}  
 			ch->bc->capability=INFO_CAPABILITY_DIGITAL_UNRESTRICTED;
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@ -3266,6 +3266,8 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event )
 	case EVENT_ALERTING:
 	case EVENT_PROCEEDING:
 	case EVENT_SETUP_ACKNOWLEDGE:
+		if (!stack->nt) break;
+
 	case EVENT_CONNECT:
 	case EVENT_RETRIEVE_ACKNOWLEDGE: