From: Automerge Script <automerge@asterisk.org>
Date: Tue, 19 Jun 2007 13:25:59 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.20-netsec~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a06cd4d098915f7b7506888666a43dcc3e5bd276;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@69893 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 3181a1a53b..a5aef1dfb0 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -2304,8 +2304,14 @@ static int misdn_hangup(struct ast_channel *ast)
 		chan_misdn_log(2, bc->port, " --> state:%s\n", misdn_get_ch_state(p));
 		
 		switch (p->state) {
-		case MISDN_INCOMING_SETUP:
 		case MISDN_CALLING:
+		case MISDN_INCOMING_SETUP:
+			/* This is the only place in misdn_hangup, where we 
+			 * can call release_chan, else it might create lot's of trouble
+			 * */
+			ast_log(LOG_NOTICE, "release channel, in CALLING/INCOMING_SETUP state.. no other events happened\n");
+			release_chan(bc);
+
 			p->state=MISDN_CLEANING;
 			misdn_lib_send_event( bc, EVENT_RELEASE_COMPLETE);
 			break;
diff --git a/res/res_features.c b/res/res_features.c
index 7211e5daa8..30326d3a58 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -383,12 +383,12 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
 			ast_log(LOG_ERROR, "Parking context '%s' does not exist and unable to create\n", parking_con);
 		}
 	}
+	if (peer) 
+		ast_say_digits(peer, pu->parkingnum, "", peer->language);
 	if (con) {
 		snprintf(exten, sizeof(exten), "%d", x);
 		ast_add_extension2(con, 1, exten, 1, NULL, NULL, parkedcall, strdup(exten), FREE, registrar);
 	}
-	if (peer) 
-		ast_say_digits(peer, pu->parkingnum, "", peer->language);
 	if (pu->notquiteyet) {
 		/* Wake up parking thread if we're really done */
 		ast_moh_start(pu->chan, NULL);