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

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3682 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 3 insertions, 3 deletions

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index ce8e7cdad..e2c0a3251 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 2506e8354..cc921f9bf 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