service: preventing to call ready state more than once.

diff --git a/src/service.c b/src/service.c
index 04bc51c..495e4de 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -363,7 +363,8 @@ static enum connman_service_state combine_state(
        }
 
        if (state_a == CONNMAN_SERVICE_STATE_READY) {
-               if (state_b == CONNMAN_SERVICE_STATE_ONLINE)
+               if (state_b == CONNMAN_SERVICE_STATE_ONLINE ||
+                               state_b == CONNMAN_SERVICE_STATE_DISCONNECT)
                        result = state_b;
                else
                        result = state_a;
@@ -371,7 +372,8 @@ static enum connman_service_state combine_state(
        }
 
        if (state_b == CONNMAN_SERVICE_STATE_READY) {
-               if (state_a == CONNMAN_SERVICE_STATE_ONLINE)
+               if (state_a == CONNMAN_SERVICE_STATE_ONLINE ||
+                               state_a == CONNMAN_SERVICE_STATE_DISCONNECT)
                        result = state_a;
                else
                        result = state_b;
@@ -389,12 +391,12 @@ static enum connman_service_state combine_state(
        }
 
        if (state_a == CONNMAN_SERVICE_STATE_DISCONNECT) {
-               result = state_b;
+               result = state_a;
                goto done;
        }
 
        if (state_b == CONNMAN_SERVICE_STATE_DISCONNECT) {
-               result = state_a;
+               result = state_b;
                goto done;
        }