mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-31 21:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update downloadfromdivecomputer.cpp

Browse source 
Preserve bluetooth address if we have it (don't rescan) and for MacOS save the mount point if we have it.     As best as I can tell, the mount points for USB devices do not change on MacOs regardless of the USB port being used.

Signed-off-by: jme <32236882+notrege@users.noreply.github.com>
This commit is contained in:
jme 2024-04-01 17:35:25 +01:00 • committed by Michael Keller
parent a5575f43a3
commit 1973d7c881
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -150,14 +150,19 @@ int DownloadFromDCWidget::deviceIndex(QString deviceText)
void DownloadFromDCWidget::DC##num##Clicked() \
{ \
ui.vendor->setCurrentIndex(ui.vendor->findText(qPrefDiveComputer::vendor##num())); \
ui.device->setCurrentText(qPrefDiveComputer::device##num()); \
productModel.setStringList(productList[qPrefDiveComputer::vendor##num()]); \
ui.product->setCurrentIndex(ui.product->findText(qPrefDiveComputer::product##num())); \
bool isBluetoothDevice = isBluetoothAddress(qPrefDiveComputer::device##num()); \
bool isMacOs = QSysInfo::kernelType() == "darwin"; \
/* If we have a Bluetooth address, use it instead of rescanning. For \
MacOs, save the mount point. This may be the wrong thing to do, but for \
the Catalina 10.15.7 laptop and Oceanic Atom 3.1 I use, the mountpoint \
is /dev/tty.usbserial-20030001 and it doesn't change regardless of the \
USB port being used. If it isn't saved, it must be reentered. */ \
if (isBluetoothDevice || isMacOs) \
ui.device->setCurrentText(qPrefDiveComputer::device##num()); \
ui.bluetoothMode->setChecked(isBluetoothDevice); \
if (ui.device->currentIndex() == -1 || (isBluetoothDevice && !isMacOs)) \
/* macOS seems to have a problem connecting to remembered bluetooth devices if it hasn't already had a connection in the current session */ \
if (ui.device->currentIndex() == -1 || isBluetoothDevice) \
ui.device->setCurrentIndex(deviceIndex(qPrefDiveComputer::device##num())); \
if (isMacOs) { \
/* it makes no sense that this would be needed on macOS but not Linux */ \