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 aba67503646bd1359124993a583e020d4d2929f2..2e58c42aaf8fa39397a34a3e06437fd8a6c496ed 100644 (file)
--- 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;
                                }
                        }