From d9e44bb22cb143d11c26aa0d6776f1b637673353 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 28 Nov 2013 16:37:59 +0200 Subject: [PATCH] android/main: Remove signal source on exit Remove signal source on exit and move check capability function in order to avoid extra check. --- android/main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/main.c b/android/main.c index d5c7b44bb..4ba501a87 100644 --- a/android/main.c +++ b/android/main.c @@ -562,18 +562,22 @@ int main(int argc, char *argv[]) __btd_log_init("*", 0); - if (!set_capabilities()) + if (!set_capabilities()) { + g_source_remove(signal); return EXIT_FAILURE; + } bluetooth_start_timeout = g_timeout_add_seconds(STARTUP_GRACE_SECONDS, quit_eventloop, NULL); if (bluetooth_start_timeout == 0) { error("Failed to init startup timeout"); + g_source_remove(signal); return EXIT_FAILURE; } if (!bt_bluetooth_start(option_index, adapter_ready)) { g_source_remove(bluetooth_start_timeout); + g_source_remove(signal); return EXIT_FAILURE; } -- 2.47.3