diff options
author | Szymon Janc <szymon.janc@gmail.com> | 2014-09-23 21:26:51 +0200 |
---|---|---|
committer | Szymon Janc <szymon.janc@gmail.com> | 2014-09-23 22:13:50 +0200 |
commit | c6f144420ba0da4e5f4b76d5999c01b8aadb8778 (patch) | |
tree | 535058ce1303d13293965d76169a82f3d432cad8 /android/main.c | |
parent | 5ea5f32bd785f93a1bc6961b763fe6780b876a0d (diff) | |
download | bluez-c6f144420ba0da4e5f4b76d5999c01b8aadb8778.tar.gz |
android: Fix not clearing up start timeout watch
If start failed due to no adapter being ready before timeout fired
invalid watch was removed on shutdown resulting in:
(bluetoothd:17083): GLib-CRITICAL **: Source ID 2 was not found
when attempting to remove it
Diffstat (limited to 'android/main.c')
-rw-r--r-- | android/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/android/main.c b/android/main.c index e99b45131..1250562f6 100644 --- a/android/main.c +++ b/android/main.c @@ -357,6 +357,9 @@ static void bluetooth_stopped(void) static gboolean quit_eventloop(gpointer user_data) { g_main_loop_quit(event_loop); + + bluetooth_start_timeout = 0; + return FALSE; } |