Fix for UTC error case

[platform/core/connectivity/wifi-mesh-manager.git] / src / mesh-service-interface.c

diff --git a/src/mesh-service-interface.c b/src/mesh-service-interface.c
index 7550e93..a37fca0 100644 (file)
--- a/src/mesh-service-interface.c
+++ b/src/mesh-service-interface.c
@@ -155,14 +155,14 @@ static gboolean _meshd_dbus_handle_enable(Manager *object,
 
        if (service->mesh_activated) {
                /* Already activated */
-               manager_complete_enable(object, invocation,
-                               MESHD_ERROR_OPERATION_FAILED);
-       } else {
-               /* Do API response first */
-               manager_complete_enable(object, invocation, ret);
-               service->mesh_activated = TRUE;
+               manager_complete_enable(object, invocation, MESHD_ERROR_NONE);
+               goto FINISH;
        }
 
+       /* Do API response first */
+       manager_complete_enable(object, invocation, ret);
+       service->mesh_activated = TRUE;
+
        meshd_check_null_ret_error("info", info, FALSE);
 
        /* Register event handler first */
@@ -175,13 +175,7 @@ static gboolean _meshd_dbus_handle_enable(Manager *object,
                MESH_LOGE("Failed to mesh_interface_initialize [%d]", ret);
                goto FINISH;
        }
-#if 0
-       ret = mesh_request_load_saved_mesh_network(&service->saved_mesh_network);
-       if (MESHD_ERROR_NONE != ret) {
-               MESH_LOGE("Failed to mesh_request_load_saved_mesh_network [%d]", ret);
-               goto FINISH;
-       }
-#endif
+
 FINISH:
        net_mesh_emit_mesh_enabled(meshd_dbus_get_object(), ret);