summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md3
-rw-r--r--core/btdiscovery.cpp7
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e6315761..16878525f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
-Mobile: fix failure to recognize several Aqualung BLE dive computers
+Core: always include BT/BLE name, even for devices no recognized as dive computer
+Core: fix failure to recognize several Aqualung BLE dive computers
Mobile: show dive tags on dive details page
Desktop: update SAC fields and other statistics when editing cylinders
Desktop: Reconnect the variations checkbox in planner
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp
index 298c0408c..909c55b23 100644
--- a/core/btdiscovery.cpp
+++ b/core/btdiscovery.cpp
@@ -274,8 +274,11 @@ void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device)
return;
}
// Do we want only devices we recognize as dive computers?
- if (m_showNonDiveComputers)
- connectionListModel.addAddress(device.address);
+ if (m_showNonDiveComputers) {
+ if (!newDevice.isEmpty())
+ newDevice += " ";
+ connectionListModel.addAddress(newDevice + device.address);
+ }
qDebug() << "Not recognized as dive computer";
}