summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-05 11:50:02 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-09-05 11:50:02 -0500
commit8f5ad894339944409022b028f4c2df17103e7591 (patch)
treee31dcbb20f2e6bc7953aff4869baf1cda60a631a
parentd4745d88937867b0d65f73bc85edf6ae7b8b8cc3 (diff)
downloadtdelibs-8f5ad894339944409022b028f4c2df17103e7591.tar.gz
tdelibs-8f5ad894339944409022b028f4c2df17103e7591.zip
Ensure that an inactive access point is reported as such
-rw-r--r--tdecore/networkbackends/network-manager/network-manager.cpp3
-rw-r--r--tdecore/tdenetworkconnections.cpp4
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);