diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-09-27 07:08:57 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-10-12 08:22:44 -0700 |
| commit | 8777945d0090ec68fcee927f9632a3e066fc7446 (patch) | |
| tree | 6b501e70d8afbddca705774b0ba8400da3eeb614 /desktop-widgets | |
| parent | c8fec97695cc2f71b59f3d8979b4203aefc6e6db (diff) | |
| download | subsurface-8777945d0090ec68fcee927f9632a3e066fc7446.tar.gz | |
Bluetooth: actually download from the device selected
If we update the device with a shortcut button, this is the reliable way to get
the information we need.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/downloadfromdivecomputer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp index f55613581..df43dbdcb 100644 --- a/desktop-widgets/downloadfromdivecomputer.cpp +++ b/desktop-widgets/downloadfromdivecomputer.cpp @@ -368,8 +368,10 @@ void DownloadFromDCWidget::on_downloadCancelRetryButton_clicked() data->setDevName(btDeviceSelectionDialog->getSelectedDeviceAddress()); data->setDevBluetoothName(btDeviceSelectionDialog->getSelectedDeviceName()); } else { - data->setDevName(qPrefDiveComputer::device()); - data->setDevBluetoothName(qPrefDiveComputer::device_name()); + QString name, address; + address = extractBluetoothNameAddress(ui.device->currentText(), name); + data->setDevName(address); + data->setDevBluetoothName(name); } } else // this breaks an "else if" across lines... not happy... |