---
 src/call-forwarding.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/call-forwarding.c b/src/call-forwarding.c
index ba52609..786d163 100644
--- a/src/call-forwarding.c
+++ b/src/call-forwarding.c
@@ -533,12 +533,14 @@ static void get_query_cf_callback(const struct 
ofono_error *error, int total,
                DBG("%s conditions:", cf_type_lut[cf->query_next]);
 
                cf_cond_list_print(l);
+       }
 
-               if (cf->query_next == CALL_FORWARDING_TYPE_NOT_REACHABLE)
+       if (cf->query_next == CALL_FORWARDING_TYPE_NOT_REACHABLE ||
+                       (cf->query_next == CALL_FORWARDING_TYPE_UNCONDITIONAL &&
+                       is_cfu_enabled(cf))) {
+               if (error->type == OFONO_ERROR_TYPE_NO_ERROR)
                        cf->flags |= CALL_FORWARDING_FLAG_CACHED;
-       }
 
-       if (cf->query_next == CALL_FORWARDING_TYPE_NOT_REACHABLE) {
                __ofono_dbus_pending_reply(&cf->pending,
                                cf_get_properties_reply(cf->pending, cf));
                return;
-- 
1.7.5.4

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono

Reply via email to