diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-29 23:01:18 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-06-29 23:01:18 +0000 |
| commit | 91e119bab43c65614a8fd5cec1bf238d4ffa4452 (patch) | |
| tree | 4b165bfa986febc15c35841254b1084bf1dfb2a3 | |
| parent | 35d5ceb9d1d6477ae1a3a57c59affa8f5e1cb4c8 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@273059 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index aba675036..2e58c42aa 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; } } |