app_dial: Fix progress timeout calculation with no answer timeout.

If to_answer is -1, simply comparing to see if the progress timeout
is smaller than the answer timeout to prefer it will fail. Add
an additional check that chooses the progress timeout if there is
no answer timeout (or as before, if the progress timeout is smaller).

Resolves: #821
(cherry picked from commit 4dd6074f9f47d343bfe7c290cb8365bb02babe59)

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 252539d615532b1e22fe79030f7874b50ccfc694..dec9284dd47d9133f1c1b7e8880ea03c5e693802 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1292,7 +1292,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
                }
 
                /* If progress timeout is active, use that if it's the shorter of the 2 timeouts. */
-               winner = ast_waitfor_n(watchers, pos, *to_progress > 0 && *to_progress < *to_answer ? to_progress : to_answer);
+               winner = ast_waitfor_n(watchers, pos, *to_progress > 0 && (*to_answer < 0 || *to_progress < *to_answer) ? to_progress : to_answer);
 
                AST_LIST_TRAVERSE(out_chans, o, node) {
                        int res = 0;