From: Anupam <anupam.r@samsung.com>
Date: Mon, 24 Aug 2020 16:35:49 +0000 (+0530)
Subject: Mesh: Remove Timer before destroying app object
X-Git-Tag: accepted/tizen/unified/20200826.133059^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F242171%2F1;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git

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 00b280b..eaca007 100644
--- 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);
 }