From df4349595baca5275412de4a7b80474eee0ced23 Mon Sep 17 00:00:00 2001
From: Henrik Probell <h.probell@actsafe.se>
Date: Wed, 11 May 2022 16:40:38 +0200
Subject: [PATCH] BluetoothSerial : Re-set _isRemoteAddressSet to false if
 connect() fails.

The internal _isRemoteAddressSet variable is set to true
when calling connect() functions. If connecting fails _isRemoteAddressSet
needs to be re-set to false, otherwise other functions, such as
discover() will fail without clear error messages.
---
 .../BluetoothSerial/src/BluetoothSerial.cpp   | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/libraries/BluetoothSerial/src/BluetoothSerial.cpp b/libraries/BluetoothSerial/src/BluetoothSerial.cpp
index 09ef2aeb180..d58a254d961 100644
--- a/libraries/BluetoothSerial/src/BluetoothSerial.cpp
+++ b/libraries/BluetoothSerial/src/BluetoothSerial.cpp
@@ -921,6 +921,8 @@ bool BluetoothSerial::setPin(const char *pin) {
 
 bool BluetoothSerial::connect(String remoteName)
 {
+    bool retval = false;
+
     if (!isReady(true, READY_TIMEOUT)) return false;
     if (remoteName && remoteName.length() < 1) {
         log_e("No remote name is provided");
@@ -942,9 +944,12 @@ bool BluetoothSerial::connect(String remoteName)
 #endif
     xEventGroupClearBits(_spp_event_group, SPP_CLOSED);
     if (esp_bt_gap_start_discovery(ESP_BT_INQ_MODE_GENERAL_INQUIRY, INQ_LEN, INQ_NUM_RSPS) == ESP_OK) {
-        return waitForConnect(SCAN_TIMEOUT);
+        retval = waitForConnect(SCAN_TIMEOUT);
     }
-    return false;
+    if (retval == false) {
+      _isRemoteAddressSet = false;
+    }
+    return retval;
 }
 
 /**
@@ -958,6 +963,7 @@ bool BluetoothSerial::connect(String remoteName)
  */
 bool BluetoothSerial::connect(uint8_t remoteAddress[], int channel, esp_spp_sec_t sec_mask, esp_spp_role_t role)
 {
+    bool retval = false;
     if (!isReady(true, READY_TIMEOUT)) return false;
     if (!remoteAddress) {
         log_e("No remote address is provided");
@@ -981,10 +987,10 @@ bool BluetoothSerial::connect(uint8_t remoteAddress[], int channel, esp_spp_sec_
 #endif
         if(esp_spp_connect(sec_mask, role, channel, _peer_bd_addr) != ESP_OK ) {
 			log_e("spp connect failed");
-			return false;
-		}
-        bool rc=waitForConnect(READY_TIMEOUT);
-        if(rc) {
+      retval = false;
+    } else {
+      retval = waitForConnect(READY_TIMEOUT);
+      if(retval) {
             log_i("connected");
         } else {
             if(this->isClosed()) {
@@ -993,12 +999,15 @@ bool BluetoothSerial::connect(uint8_t remoteAddress[], int channel, esp_spp_sec_
                 log_e("connect timed out after %dms", READY_TIMEOUT);
             }
         }
-        return rc;
     }
-    if (esp_spp_start_discovery(_peer_bd_addr) == ESP_OK) {
-        return waitForConnect(READY_TIMEOUT);
+  } else if (esp_spp_start_discovery(_peer_bd_addr) == ESP_OK) {
+    retval = waitForConnect(READY_TIMEOUT);
+  }
+
+  if (!retval) {
+    _isRemoteAddressSet = false;
     }
-    return false;
+    return retval;
 }
 
 bool BluetoothSerial::connect()