diff options
| -rw-r--r-- | tdecore/networkbackends/network-manager/network-manager.cpp | 3 | ||||
| -rw-r--r-- | tdecore/tdenetworkconnections.cpp | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/tdecore/networkbackends/network-manager/network-manager.cpp b/tdecore/networkbackends/network-manager/network-manager.cpp index 5cf5f7534..2671ac57b 100644 --- a/tdecore/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/networkbackends/network-manager/network-manager.cpp @@ -1342,6 +1342,9 @@ TDENetworkDeviceInformation TDENetworkConnectionManager_BackendNM::deviceInforma ret.wiFiInfo.activeAccessPointBSSID = apInfo->BSSID; delete apInfo; } + else { + ret.wiFiInfo.activeAccessPointBSSID = TDEMACAddress(); + } ret.wiFiInfo.wirelessFlags = tdeWiFiFlagsToNMWiFiFlags(d->m_wiFiDeviceProxy->getWirelessCapabilities(error)); } else { diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdenetworkconnections.cpp index cc4c4b94d..39899b131 100644 --- a/tdecore/tdenetworkconnections.cpp +++ b/tdecore/tdenetworkconnections.cpp @@ -657,6 +657,10 @@ TDENetworkDevice* TDENetworkConnectionManager::findDeviceByUUID(TQString uuid) { } TDENetworkWiFiAPInfo* TDENetworkConnectionManager::findAccessPointByBSSID(TDEMACAddress bssid) { + if (!bssid.isValid()) { + return NULL; + } + TDENetworkHWNeighbor *neighbor; for (neighbor = m_hwNeighborList->first(); neighbor; neighbor = m_hwNeighborList->next()) { TDENetworkWiFiAPInfo* apInfo = dynamic_cast<TDENetworkWiFiAPInfo*>(neighbor); |