diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-13 04:23:17 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-13 04:23:17 +0000 |
| commit | 93168b3fbf2217f64a63e57729e2b4a66b0a92df (patch) | |
| tree | 40b33e8d1cafe4a7baee0f187529a67efc5bbdac /channel.c | |
| parent | 9df0e1b1e2d1dd904cff31953a0956d38f23deea (diff) | |
This small patch fixes bug 8541, where the L option to the Dial app wasn't working right. A similar bug (8386) was filed and fixed earlier, but an intervening bug fix to a DTMF problem broke the L() code in a different way. Hopefully, everything is happy now.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@48434 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
| -rw-r--r-- | channel.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -39,7 +39,7 @@ #include <zaptel.h> #endif /* __linux__ */ #ifndef ZT_TIMERPING -#error "You need newer zaptel! Please cvs update zaptel" +#error "You need newer zaptel! Please svn update zaptel" #endif #endif @@ -3351,7 +3351,10 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct if (bridge_end.tv_sec) { to = ast_tvdiff_ms(bridge_end, ast_tvnow()); if (to <= 0) { - res = AST_BRIDGE_COMPLETE; + if (config->timelimit) + res = AST_BRIDGE_RETRY; + else + res = AST_BRIDGE_COMPLETE; break; } } else |