Changeset 84b1b63 in subsurface


Ignore:
Timestamp:
May 28, 2017, 3:53:05 AM (7 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
3f0d210
Parents:
057f46f
git-author:
Jan Mulder <jlmulder@…> (05/28/17 03:29:26)
git-committer:
Dirk Hohndel <dirk@…> (05/28/17 03:53:05)
Message:

Fix abort when Bluetooth mode is default

Commit dec47e11cd3 introduces a SIGSEGV in case the user has Bluetooth
download selected from its previous sessions. Accessing the "Import from
dive computer" crashes immediately. Reverting a small part of commit
dec47e11cd3 solves this.

Signed-off-by: Jan Mulder <jlmulder@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • desktop-widgets/downloadfromdivecomputer.cpp

    r7858376 r84b1b63  
    7171        connect(close, SIGNAL(activated()), this, SLOT(close()));
    7272        connect(quit, SIGNAL(activated()), parent, SLOT(close()));
    73 #if defined(BT_SUPPORT) && defined(SSRF_CUSTOM_SERIAL)
    74         connect(ui.bluetoothMode, SIGNAL(stateChanged(int)), this, SLOT(enableBluetoothMode(int)));
    75         connect(ui.chooseBluetoothDevice, SIGNAL(clicked()), this, SLOT(selectRemoteBluetoothDevice()));
    76 #endif
    7773
    7874        auto dc = SettingsObjectWrapper::instance()->dive_computer_settings;
     
    9692        ui.bluetoothMode->setChecked(dc->downloadMode() == DC_TRANSPORT_BLUETOOTH);
    9793        btDeviceSelectionDialog = 0;
     94        connect(ui.bluetoothMode, SIGNAL(stateChanged(int)), this, SLOT(enableBluetoothMode(int)));
     95        connect(ui.chooseBluetoothDevice, SIGNAL(clicked()), this, SLOT(selectRemoteBluetoothDevice()));
    9896        ui.chooseBluetoothDevice->setEnabled(ui.bluetoothMode->isChecked());
    9997#else
Note: See TracChangeset for help on using the changeset viewer.