ETM-Schurig/powersync-libnm
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change sshudown order of bluetooth server and delete the objects later

Browse Source
This commit is contained in:
Simon Stürz 2020-11-17 12:45:27 +01:00
parent e42764371d
commit 06cc977442
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libnymea-networkmanager/bluetooth/bluetoothserver.cpp
View File

@ -462,7 +462,7 @@ void BluetoothServer::start()
advertisingData.setDiscoverability(QLowEnergyAdvertisingData::DiscoverabilityGeneral); advertisingData.setDiscoverability(QLowEnergyAdvertisingData::DiscoverabilityGeneral);
advertisingData.setIncludePowerLevel(true); advertisingData.setIncludePowerLevel(true);
advertisingData.setLocalName(m_advertiseName); advertisingData.setLocalName(m_advertiseName);
// FIXME: set guh manufacturer SIG data once available // FIXME: set manufacturer SIG data once available
// Note: start advertising in 100 ms interval, this makes the device better discoverable on certain phones // Note: start advertising in 100 ms interval, this makes the device better discoverable on certain phones
QLowEnergyAdvertisingParameters advertisingParameters; QLowEnergyAdvertisingParameters advertisingParameters;
@ -479,20 +479,20 @@ void BluetoothServer::stop()
qCDebug(dcNetworkManagerBluetoothServer()) << "Stopping bluetooth server."; qCDebug(dcNetworkManagerBluetoothServer()) << "Stopping bluetooth server.";
qCDebug(dcNetworkManagerBluetoothServer()) << "-------------------------------------"; qCDebug(dcNetworkManagerBluetoothServer()) << "-------------------------------------";
if (m_localDevice) {
qCDebug(dcNetworkManagerBluetoothServer()) << "Set host mode to connectable.";
m_localDevice->setHostMode(QBluetoothLocalDevice::HostConnectable);
delete m_localDevice;
m_localDevice = nullptr;
}
if (m_controller) { if (m_controller) {
qCDebug(dcNetworkManagerBluetoothServer()) << "Stop advertising."; qCDebug(dcNetworkManagerBluetoothServer()) << "Stop advertising.";
m_controller->stopAdvertising(); m_controller->stopAdvertising();
delete m_controller; m_controller->deleteLater();
m_controller = nullptr; m_controller = nullptr;
} }
if (m_localDevice) {
qCDebug(dcNetworkManagerBluetoothServer()) << "Set host mode to connectable.";
m_localDevice->setHostMode(QBluetoothLocalDevice::HostConnectable);
m_localDevice->deleteLater();
m_localDevice = nullptr;
}
setConnected(false); setConnected(false);
setRunning(false); setRunning(false);
} }