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

Update downloadfromdivecomputer.cpp

Browse source 
Removed the MacOs specific code and added comment explaining why ui.device.Text must be set before the ui.bluetoothMode change handler runs.

Signed-off-by: jme <32236882+notrege@users.noreply.github.com>
This commit is contained in:
jme 2024-04-15 16:19:00 +01:00 • committed by Michael Keller
parent 1973d7c881
commit 334a357c19
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -153,24 +153,17 @@ void DownloadFromDCWidget::DC##num##Clicked() \
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) \
/* If we have a Bluetooth device, set the ui.device->CurrentText to avoid starting \
a Bluetooth scan in enableBluetoothMode(). \
Note: enableBlueToothMode() will set ui.device.CurrentIndex to -1 unless \
ui.bluetoothMode is checked. */ \
if (isBluetoothDevice) \
ui.device->setCurrentText(qPrefDiveComputer::device##num()); \
ui.bluetoothMode->setChecked(isBluetoothDevice); \
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 */ \
QCoreApplication::processEvents(); \
ui.vendor->update(); \
ui.product->update(); \
ui.device->update(); \
} \
}
#else
#define DCBUTTON(num) \