OSDN Git Service

android/main: Remove timeout source on exit
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Thu, 28 Nov 2013 14:37:58 +0000 (16:37 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Fri, 29 Nov 2013 08:29:00 +0000 (10:29 +0200)
This fixes memory leak types of warnings from some tools.

android/main.c

index ac80c17..d5c7b44 100644 (file)
@@ -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();