From de3b67b664320f1955350612e3fb5ede43ce5eee Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Sat, 10 Oct 2020 13:00:45 +0900 Subject: [PATCH] Destroy receiver when launching in case that BT is not connected Change-Id: I5413d0a17683d7b189b331d0a65c269e87366515 Signed-off-by: Jihoon Kim --- receiver/src/ft.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/receiver/src/ft.cpp b/receiver/src/ft.cpp index f797447..4467722 100644 --- a/receiver/src/ft.cpp +++ b/receiver/src/ft.cpp @@ -655,7 +655,9 @@ static void _on_connection_terminated(sap_peer_agent_h peer_agent, break; } - sap_socket_destroy(priv->socket); + if (priv->socket) + sap_socket_destroy(priv->socket); + priv->socket = NULL; set_sync_progressing(FALSE); @@ -1222,6 +1224,7 @@ static void _on_device_status_changed(sap_device_status_e status, sap_transport_type_e transport_type, void *user_data) { + bool unknown_transport_type = false; STLOGD("%s, status :%d", __func__, status); switch (transport_type) { @@ -1242,12 +1245,13 @@ static void _on_device_status_changed(sap_device_status_e status, break; default: STLOGE("unknown transport_type (%d)", transport_type); + unknown_transport_type = true; break; } switch (status) { case SAP_DEVICE_STATUS_DETACHED: - STLOGD("device is not connected."); + STLOGD("device is detached."); send_message("sync_stop_result", "cancel"); break; case SAP_DEVICE_STATUS_ATTACHED: @@ -1258,6 +1262,9 @@ static void _on_device_status_changed(sap_device_status_e status, STLOGE("unknown status (%d)", status); break; } + + if (unknown_transport_type && status == SAP_DEVICE_STATUS_DETACHED) + sticker_service_quit(); } gboolean agent_initialize() -- 2.7.4