From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 29 Jun 2010 23:01:18 +0000 (+0000)
Subject: Merged revisions 273058 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=adc0bc43ed3946c6c5e30eeac6fe4b418fe9a88b;p=thirdparty%2Fasterisk.git

Merged revisions 273058 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r273058 | tilghman | 2010-06-29 17:59:51 -0500 (Tue, 29 Jun 2010) | 11 lines

  Recorded merge of revisions 273057 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r273057 | tilghman | 2010-06-29 17:58:58 -0500 (Tue, 29 Jun 2010) | 4 lines

    _Really_ skip the channel... don't just retry for another 200 cycles.

    (Closes issue SWP-1652, ABE-2240)
  ........
................


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

diff --git a/main/channel.c b/main/channel.c
index aba6750364..2e58c42aaf 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1255,7 +1255,7 @@ static struct ast_channel *channel_find_locked(const struct ast_channel *prev,
 				 * as there can be no more matches.
 				 */
 				if (!(name && !namelen)) {
-					prev = c;
+					_prev = c;
 					retries = -1;
 				}
 			}