3 files changed, 9 insertions(+), 1 deletions(-)

M module-bluetooth/Bluetooth/CommandHandler.cpp
M module-bluetooth/Bluetooth/interface/profiles/ProfileManager.cpp
M module-bluetooth/Bluetooth/interface/profiles/ProfileManager.hpp

@@ 158,7 158,9 @@ namespace bluetooth
     Error::Code CommandHandler::unpair(uint8_t *addr)
     {
         LOG_INFO("Unpairing...");
-        profileManager->disconnect();
+        if (profileManager->isAddressActuallyUsed(addr)) {
+            profileManager->disconnect();
+        }
         return driver->unpair(addr) ? Error::Success : Error::LibraryError;
     }
 

@@ 123,4 123,9 @@ namespace bluetooth
         profilesList[profileType]->setAudioDevice(device);
         return switchProfile(profileType);
     }
+    auto ProfileManager::isAddressActuallyUsed(bd_addr_t address) -> bool
+    {
+        return static_cast<bool>(bd_addr_cmp(address, remoteAddr));
+    }
+
 } // namespace bluetooth

@@ 42,6 42,7 @@ namespace bluetooth
         auto startRinging() -> Error::Code;
         auto stopRinging() -> Error::Code;
         auto initializeCall() -> Error::Code;
+        auto isAddressActuallyUsed(bd_addr_t address) -> bool;
 
         auto setAudioDevice(std::shared_ptr<BluetoothAudioDevice> device) -> Error::Code;