fixup! Iterate all type's information when checking if release callback invoking

Change-Id: Ie6114ff5d64b3e85460719943867a8ca81193fce

diff --git a/packaging/mm-resource-manager.spec b/packaging/mm-resource-manager.spec
index cda86a3..38277b4 100644 (file)
--- a/packaging/mm-resource-manager.spec
+++ b/packaging/mm-resource-manager.spec
@@ -1,6 +1,6 @@
 Name:       mm-resource-manager
 Summary:    A Multimedia Resource Manager API
-Version:    0.2.54
+Version:    0.2.55
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/daemon/mm_resource_manager_daemon_priv.c b/src/daemon/mm_resource_manager_daemon_priv.c
index 5544b5e..b54df45 100644 (file)
--- a/src/daemon/mm_resource_manager_daemon_priv.c
+++ b/src/daemon/mm_resource_manager_daemon_priv.c
@@ -670,7 +670,7 @@ static gboolean __is_release_invoking(mm_resource_manager_dmn_p manager)
 {
        mm_resource_manager_res_type_e idx;
        for (idx = MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_DECODER; idx < MM_RESOURCE_MANAGER_RES_TYPE_MAX; idx++) {
-               if (manager->resources[idx]->state == MM_RESOURCE_MANAGER_RES_STATE_FOR_RELEASE)
+               if (manager->resources[idx] && manager->resources[idx]->state == MM_RESOURCE_MANAGER_RES_STATE_FOR_RELEASE)
                        return TRUE;
        }
 

diff --git a/src/lib/mm_resource_manager_priv.c b/src/lib/mm_resource_manager_priv.c
index e1d3a90..c1cbfa4 100644 (file)
--- a/src/lib/mm_resource_manager_priv.c
+++ b/src/lib/mm_resource_manager_priv.c
@@ -408,8 +408,11 @@ int _mm_resource_manager_release_other_resources(mm_resource_manager_s *handle)
        len = handle->resources->len;
 
        for (idx = 0; idx < len; idx++) {
-               if (!__mark_resource_for_release(handle->resources, idx, (mm_resource_manager_res_p) handle->resources->pdata[idx]))
-                       MM_RM_INFO("[idx %d] resource length %d", idx, len);
+               if (!__mark_resource_for_release(handle->resources, idx, (mm_resource_manager_res_p) handle->resources->pdata[idx])) {
+                       MM_RM_WARNING("[idx %d] resource length %d", idx, len);
+
+                       return MM_RESOURCE_MANAGER_ERROR_NONE;
+               }
        }
 
        MM_RM_INFO("[RELEASE] dbus_commit");