Merge branch 'jb52659' into 'master'

[libconnman-qt] Fix crash on connman restart. Contributes to JB#52659 See merge request mer-core/libconnman-qt!53
sailfishos · Jan 12, 2021 · 5eff436 · 5eff436
2 parents 6024bd6 + 1b4d474
commit 5eff436
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/libconnman-qt/networkmanager.cpp b/libconnman-qt/networkmanager.cpp
@@ -451,9 +451,16 @@ void NetworkManager::disconnectServices()
     bool wasValid = isValid();
     m_priv->setServicesAvailable(false);
 
+    bool emitDefaultRouteChanged = false;
     if (m_defaultRoute != m_invalidDefaultRoute) {
         m_defaultRoute = m_invalidDefaultRoute;
-        Q_EMIT defaultRouteChanged(m_defaultRoute);
+        emitDefaultRouteChanged = true;
+    }
+
+    bool emitConnectedWifiChanged = false;
+    if (m_priv->m_connectedWifi) {
+        m_priv->m_connectedWifi = NULL;
+        emitConnectedWifiChanged = true;
     }
 
     if (m_proxy) {
@@ -498,6 +505,14 @@ void NetworkManager::disconnectServices()
         Q_EMIT servicesChanged();
     }
 
+    if (emitDefaultRouteChanged) {
+        Q_EMIT defaultRouteChanged(m_defaultRoute);
+    }
+
+    if (emitConnectedWifiChanged) {
+        Q_EMIT connectedWifiChanged();
+    }
+
     if (emitSavedServicesChanged) {
         Q_EMIT savedServicesChanged();
     }