From da444beb2d101e46988743e40794189e26b10407 Mon Sep 17 00:00:00 2001 From: Pekka Pessi Date: Fri, 26 Nov 2010 17:14:49 +0200 Subject: voicecall: fix dial result handling The existing call will be automatically put on hold if there is an existing active call when dialing. On some modems the dial request returns only after the dialed call is active and the existing call has been put on hold. However, on isimodem driver the dial request returns immediately before the existing call has changed its status. With isimodem driver the dial_handle_result() selected the existing call from the list when it should have created a new one. The dial result handling now guards againt returning a previously dialed active call as result. --- src/voicecall.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/voicecall.c b/src/voicecall.c index d52428f8..dbf3e9ad 100644 --- a/src/voicecall.c +++ b/src/voicecall.c @@ -68,6 +68,7 @@ struct voicecall { char *message; uint8_t icon_id; gboolean untracked; + gboolean dial_result_handled; }; struct dial_request { @@ -1092,9 +1093,18 @@ static struct voicecall *dial_handle_result(struct ofono_voicecall *vc, v = l->data; if (v->call->status == CALL_STATUS_DIALING || - v->call->status == CALL_STATUS_ALERTING || - v->call->status == CALL_STATUS_ACTIVE) - return v; + v->call->status == CALL_STATUS_ALERTING) + goto handled; + + /* + * Dial request may return before existing active call + * is put on hold or after dialed call has got active + */ + if (v->call->status == CALL_STATUS_ACTIVE && + v->call->direction == + CALL_DIRECTION_MOBILE_ORIGINATED && + !v->dial_result_handled) + goto handled; } call = synthesize_outgoing_call(vc, number); @@ -1115,6 +1125,9 @@ static struct voicecall *dial_handle_result(struct ofono_voicecall *vc, *need_to_emit = TRUE; +handled: + v->dial_result_handled = TRUE; + return v; } -- cgit v1.2.3