Mesh: Remove Timer before destroying app object

Change-Id: I4bf2b2b9a29fe43408147537a439299f81bd250e
Signed-off-by: Anupam <anupam.r@samsung.com>

diff --git a/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.c
index 00b280b8f5c85170a412f17c85a3b15a9f6417b5..eaca007b82bc9ea60b980d0c694a9d3bfd36a099 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-mesh-dbus-handler.c
@@ -358,6 +358,12 @@ static void __bt_hal_mesh_destroy_app_object(gpointer data)
                                g_slist_length(app->elements));
                g_slist_free_full(app->elements, __mesh_hal_free_elements);
        }
+
+       if (app->scan_timer_id > 0) {
+               INFO("Mesh: Remove timer if already running");
+               g_source_remove(app->scan_timer_id);
+               app->scan_timer_id = 0;
+       }
        g_free(app);
 }