diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-28 19:18:48 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-28 19:18:48 +0000 |
| commit | 52b9135b4811377fb51ffb1e325a0b49279ff8d2 (patch) | |
| tree | 9dbae79be95f82259abcd42f5c07426c61e965be /channels | |
| parent | d72764c01b92b9d141dd0348fa35770c4ec5f152 (diff) | |
don't declare the priority inside of the for loop so that the priority
can actually be switched at each iteration (issue #5319)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6675 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index c8a897351..1e005ec79 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2938,6 +2938,7 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann int ofd0, ofd1; int oi0, oi1, i0 = -1, i1 = -1, t0, t1; int os0 = -1, os1 = -1; + int priority = 0; struct ast_channel *oc0, *oc1; enum ast_bridge_result res; @@ -3110,7 +3111,6 @@ static enum ast_bridge_result zt_bridge(struct ast_channel *c0, struct ast_chann for (;;) { struct ast_channel *c0_priority[2] = {c0, c1}; struct ast_channel *c1_priority[2] = {c1, c0}; - int priority = 0; /* Here's our main loop... Start by locking things, looking for private parts, and then balking if anything is wrong */ |