From 058b7badd5eecf34af4abb5e117ac467ae1556c0 Mon Sep 17 00:00:00 2001
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Thu, 28 Nov 2013 16:37:58 +0200
Subject: [PATCH] android/main: Remove timeout source on exit

This fixes memory leak types of warnings from some tools.
---
 android/main.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/android/main.c b/android/main.c
index ac80c1738..d5c7b44bb 100644
--- a/android/main.c
+++ b/android/main.c
@@ -572,8 +572,10 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	if (!bt_bluetooth_start(option_index, adapter_ready))
+	if (!bt_bluetooth_start(option_index, adapter_ready)) {
+		g_source_remove(bluetooth_start_timeout);
 		return EXIT_FAILURE;
+	}
 
 	/* Use params: mtu = 0, flags = 0 */
 	start_sdp_server(0, 0);
@@ -586,6 +588,9 @@ int main(int argc, char *argv[])
 
 	g_source_remove(signal);
 
+	if (bluetooth_start_timeout > 0)
+		g_source_remove(bluetooth_start_timeout);
+
 	cleanup_hal_connection();
 	stop_sdp_server();
 	bt_bluetooth_cleanup();
-- 
2.47.3