From: Mark Spencer <markster@digium.com>
Date: Tue, 31 Aug 2004 00:08:52 +0000 (+0000)
Subject: Make sure we behave properly for parking (bug #2292)
X-Git-Tag: 1.0.0~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5259155e52cdf0bf3fdf5e8c5e53347a0ac48fb7;p=thirdparty%2Fasterisk.git

Make sure we behave properly for parking (bug #2292)


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index ce8e7cdadb..e2c0a32514 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -4762,7 +4762,7 @@ static void *ss_thread(void *data)
 				tone_zone_play_tone(p->subs[index].zfd, -1);
 			else
 				tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALTONE);
-			if (ast_exists_extension(chan, chan->context, exten, 1, p->callerid)) {
+			if (ast_exists_extension(chan, chan->context, exten, 1, p->callerid) && strcmp(chan->exten, ast_parking_ext())) {
 				if (!res || !ast_matchmore_extension(chan, chan->context, exten, 1, p->callerid)) {
 					if (getforward) {
 						/* Record this as the forwarding extension */
diff --git a/manager.c b/manager.c
index 2506e83543..cc921f9bf4 100755
--- a/manager.c
+++ b/manager.c
@@ -3,9 +3,9 @@
  *
  * Channel Management and more
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2004, Digium, Inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License