From 3ca336d4daa01c1b5152778a00a5893d1cec578b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 22 Nov 2018 12:50:08 +0100 Subject: [PATCH] Fix offline mode crash if already connected --- nymea-networkmanager/core.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nymea-networkmanager/core.cpp b/nymea-networkmanager/core.cpp index 656f3a8..7953da1 100644 --- a/nymea-networkmanager/core.cpp +++ b/nymea-networkmanager/core.cpp @@ -175,7 +175,7 @@ void Core::evaluateNetworkManagerState(const NetworkManager::NetworkManagerState return; // 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(); return; } @@ -237,10 +237,10 @@ void Core::startService() void Core::stopService() { - if (m_bluetoothServer->running()) + if (m_bluetoothServer && m_bluetoothServer->running()) { qCDebug(dcApplication()) << "Stop bluetooth service"; - - m_bluetoothServer->stop(); + m_bluetoothServer->stop(); + } } void Core::onAdvertisingTimeout() @@ -354,6 +354,9 @@ void Core::onNetworkManagerWirelessEnabledChanged(bool enabled) void Core::onNetworkManagerStateChanged(const NetworkManager::NetworkManagerState &state) { qCDebug(dcApplication()) << state; + if (!m_bluetoothServer) + return; + m_bluetoothServer->onNetworkManagerStateChanged(state); evaluateNetworkManagerState(state); }