summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/btdiscovery.cpp2
-rw-r--r--mobile-widgets/qml/DownloadFromDiveComputer.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp
index 9594ccb89..63a1df5fd 100644
--- a/core/btdiscovery.cpp
+++ b/core/btdiscovery.cpp
@@ -195,7 +195,7 @@ void BTDiscovery::btDeviceDiscoveredMain(const btPairedDevice &device)
btVP.vendorIdx = vendorList.indexOf(vendor);
btVP.productIdx = productList[vendor].indexOf(newDevice);
btDCs << btVP;
- connectionListModel.addAddress(device.address + " (" + newDevice + ")");
+ connectionListModel.addAddress(newDevice + " " + device.address);
return;
}
connectionListModel.addAddress(device.address);
diff --git a/mobile-widgets/qml/DownloadFromDiveComputer.qml b/mobile-widgets/qml/DownloadFromDiveComputer.qml
index 199f6aa67..eafc22150 100644
--- a/mobile-widgets/qml/DownloadFromDiveComputer.qml
+++ b/mobile-widgets/qml/DownloadFromDiveComputer.qml
@@ -199,7 +199,7 @@ Kirigami.Page {
text = qsTr("Retry")
// strip any BT Name from the address
var devName = downloadThread.deviceData.devName
- downloadThread.deviceData.devName = devName.replace(/ (.*)$/, "")
+ downloadThread.deviceData.devName = devName.replace(/^(.*) /, "")
manager.appendTextToLog("DCDownloadThread started for " + downloadThread.deviceData.product + " on "+ downloadThread.deviceData.devName)
progressBar.visible = true
downloadThread.start()