diff --git a/cpp/core/internal/mediums/bluetooth_classic.cc b/cpp/core/internal/mediums/bluetooth_classic.cc index 6f870b17..bfa15992 100644 --- a/cpp/core/internal/mediums/bluetooth_classic.cc +++ b/cpp/core/internal/mediums/bluetooth_classic.cc @@ -407,11 +407,21 @@ BluetoothSocket BluetoothClassic::AttemptToConnect( BluetoothDevice BluetoothClassic::GetRemoteDevice( const std::string& mac_address) { MutexLock lock(&mutex_); + + if (!IsAvailableLocked()) { + return {}; + } + return medium_.GetRemoteDevice(mac_address); } std::string BluetoothClassic::GetMacAddress() const { MutexLock lock(&mutex_); + + if (!IsAvailableLocked()) { + return {}; + } + return medium_.GetMacAddress(); }