summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--channels/chan_dahdi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b9b915064..b4c8ec366 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -1870,7 +1870,7 @@ static int my_check_waitingfordt(void *pvt)
{
struct dahdi_pvt *p = pvt;
- if (p->waitingfordt.tv_usec) {
+ if (p->waitingfordt.tv_sec) {
return 1;
}
@@ -8472,7 +8472,7 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast)
#if 0
ast_debug(1, "Read %d of voice on %s\n", p->subs[idx].f.datalen, ast->name);
#endif
- if (p->dialing || p->radio || /* Transmitting something */
+ if ((p->dialing && !p->waitingfordt.tv_sec) || p->radio || /* Transmitting something */
(idx && (ast_channel_state(ast) != AST_STATE_UP)) || /* Three-way or callwait that isn't up */
((idx == SUB_CALLWAIT) && !p->subs[SUB_CALLWAIT].inthreeway) /* Inactive and non-confed call-wait */
) {