---
src/call-forwarding.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index aa1ece7..204ecc7 100644
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -1004,6 +1004,16 @@ static void ss_set_query_cf_callback(const struct
ofono_error *error, int total,
set_new_cond_list(cf, cf->query_next, l);
+ if (cf->query_next == CALL_FORWARDING_TYPE_UNCONDITIONAL &&
+ cf->query_next == cf->query_end) {
+ cf->flags |= CALL_FORWARDING_FLAG_CACHED;
+ /*
+ * CFU has been disabled, conditionals need to be updated
+ */
+ if (is_cfu_enabled(cf) == FALSE)
+ cf->query_end = CALL_FORWARDING_TYPE_NOT_REACHABLE;
+ }
+
if (cf->query_next != cf->query_end) {
cf->query_next++;
ss_set_query_next_cf_cond(cf);
--
1.7.5.4
_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono
