[svn-commits] tilghman: branch 1.6.2 r273059 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Jun 29 18:01:18 2010
New Revision: 273059

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273059
Log:
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)
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=273059&r1=273058&r2=273059
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Tue Jun 29 18:01:18 2010
@@ -1255,7 +1255,7 @@
 				 * as there can be no more matches.
 				 */
 				if (!(name && !namelen)) {
-					prev = c;
+					_prev = c;
 					retries = -1;
 				}
 			}