[TBT][Push][NonACR][TFDF-1938, PBAP All Vcards : tbtcoreapp crash on selecting PASS...

Change-Id: I0e769af2f2748a53883713c6d669fe095aaa79fd
Signed-off-by: Priya Kohli <priya.kohli@samsung.com>

diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk
index 547e39282772c751244590328792fbb52895a055..88c9b3a259a3c143e926b2fccd78d00e916b1c51 100755 (executable)
Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ

diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk
index fb6d343df2e40d7da9d2a5db30f3b58ac8570285..1e8fa1f7780cac290b899ff7935078b6b072c815 100755 (executable)
Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ

diff --git a/tbtcoreapp/src/view/tbt-bluetooth-view.c b/tbtcoreapp/src/view/tbt-bluetooth-view.c
index 060631842fa110a3baa0f9a18bf1003ba7ba0b39..f9baee87c6461249a7eb40c5924e699b3b217038 100644 (file)
--- a/tbtcoreapp/src/view/tbt-bluetooth-view.c
+++ b/tbtcoreapp/src/view/tbt-bluetooth-view.c
@@ -2817,8 +2817,11 @@ static void _app_destroy_cb(void* this)
                //PBAP deinitialization code goes here
                result =  bt_pbap_client_unset_connection_state_changed_cb();
                RETM_IF(result != BT_ERROR_NONE, "bt_pbap_client_unset_connection_state_changed_cb fail > Error = %s", get_bluetooth_error(result));
-               result = bt_pbap_client_disconnect(view->selected_device_info->remote_address);
-               RETM_IF(result != BT_ERROR_NONE, "bt_pbap_client_disconnect fail > Error = %s", get_bluetooth_error(result));
+               if(view->selected_device_info && view->selected_device_info->remote_address)
+               {
+                       result = bt_pbap_client_disconnect(view->selected_device_info->remote_address);
+                       RETM_IF(result != BT_ERROR_NONE, "bt_pbap_client_disconnect fail > Error = %s", get_bluetooth_error(result));
+               }
                result = bt_pbap_client_deinitialize();
                RETM_IF(result != BT_ERROR_NONE, "bt_pbap_client_deinitialize fail > Error = %s", get_bluetooth_error(result));
        }