When swapping subs, queue a null frame, extend delay for hangup-on-flash

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@823 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 2 insertions, 0 deletions

diff --git a/channel.c b/channel.c
index 032b693bc..49982d849 100755
--- a/channel.c
+++ b/channel.c
@@ -378,6 +378,8 @@ int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, int lock)
 		if (write(chan->pvt->alertpipe[1], &blah, sizeof(blah)) != sizeof(blah))
 			ast_log(LOG_WARNING, "Unable to write to alert pipe on %s, frametype/subclass %d/%d (qlen = %d): %s!\n",
 				chan->name, f->frametype, f->subclass, qlen, strerror(errno));
+	} else if (chan->blocking) {
+		pthread_kill(chan->blocker, SIGURG);
 	}
 	if (lock)
 		ast_pthread_mutex_unlock(&chan->lock);