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

Fix offline mode crash if already connected

Browse Source
This commit is contained in:
Simon Stürz 2018-11-22 12:50:08 +01:00
parent ff35e2d152
commit 3ca336d4da
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nymea-networkmanager/core.cpp
View File

@ -175,7 +175,7 @@ void Core::evaluateNetworkManagerState(const NetworkManager::NetworkManagerState
return; return;
// Note: if the wireless device is in the access point mode, the bluetooth server should stop // Note: if the wireless device is in the access point mode, the bluetooth server should stop
if (m_wirelessDevice->mode() == WirelessNetworkDevice::ModeAccessPoint) { if (m_wirelessDevice && m_wirelessDevice->mode() == WirelessNetworkDevice::ModeAccessPoint) {
stopService(); stopService();
return; return;
} }
@ -237,10 +237,10 @@ void Core::startService()
void Core::stopService() void Core::stopService()
{ {
if (m_bluetoothServer->running()) if (m_bluetoothServer && m_bluetoothServer->running()) {
qCDebug(dcApplication()) << "Stop bluetooth service"; qCDebug(dcApplication()) << "Stop bluetooth service";
m_bluetoothServer->stop();
m_bluetoothServer->stop(); }
} }
void Core::onAdvertisingTimeout() void Core::onAdvertisingTimeout()
@ -354,6 +354,9 @@ void Core::onNetworkManagerWirelessEnabledChanged(bool enabled)
void Core::onNetworkManagerStateChanged(const NetworkManager::NetworkManagerState &state) void Core::onNetworkManagerStateChanged(const NetworkManager::NetworkManagerState &state)
{ {
qCDebug(dcApplication()) << state; qCDebug(dcApplication()) << state;
if (!m_bluetoothServer)
return;
m_bluetoothServer->onNetworkManagerStateChanged(state); m_bluetoothServer->onNetworkManagerStateChanged(state);
evaluateNetworkManagerState(state); evaluateNetworkManagerState(state);
} }