summaryrefslogtreecommitdiffstats
path: root/tdenetworkmanager/src/tdenetman-wireless_manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tdenetworkmanager/src/tdenetman-wireless_manager.cpp')
-rw-r--r--tdenetworkmanager/src/tdenetman-wireless_manager.cpp43
1 files changed, 27 insertions, 16 deletions
diff --git a/tdenetworkmanager/src/tdenetman-wireless_manager.cpp b/tdenetworkmanager/src/tdenetman-wireless_manager.cpp
index f240778..de6a387 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_manager.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_manager.cpp
@@ -82,14 +82,19 @@ TQValueList<TDENetworkWiFiAPInfo*> internalGetAccessPoints(TDENetworkDevice* dev
TQValueList<TDENetworkWiFiAPInfo*> list;
if (dev) {
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
- TDENetworkHWNeighbor* neighbor;
- TDENetworkHWNeighborList* neighbors = deviceConnMan->siteSurvey();
- for (neighbor = neighbors->first(); neighbor; neighbor = neighbors->next()) {
- TDENetworkWiFiAPInfo* apInfo = dynamic_cast<TDENetworkWiFiAPInfo*>(neighbor);
- if (!apInfo) {
- continue;
+ if (deviceConnMan)
+ {
+ TDENetworkHWNeighbor* neighbor;
+ TDENetworkHWNeighborList* neighbors = deviceConnMan->siteSurvey();
+ for (neighbor = neighbors->first(); neighbor; neighbor = neighbors->next())
+ {
+ TDENetworkWiFiAPInfo* apInfo = dynamic_cast<TDENetworkWiFiAPInfo*>(neighbor);
+ if (!apInfo)
+ {
+ continue;
+ }
+ list.append(apInfo);
}
- list.append(apInfo);
}
}
return list;
@@ -141,15 +146,21 @@ TQValueList<TDENetworkWiFiAPInfo*> internalGetAccessPointsWithESSID(TQByteArray
TQValueList<TDENetworkWiFiAPInfo*> list;
if (dev) {
TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
- TDENetworkHWNeighbor* neighbor;
- TDENetworkHWNeighborList* neighbors = deviceConnMan->siteSurvey();
- for (neighbor = neighbors->first(); neighbor; neighbor = neighbors->next()) {
- TDENetworkWiFiAPInfo* apInfo = dynamic_cast<TDENetworkWiFiAPInfo*>(neighbor);
- if (!apInfo) {
- continue;
- }
- if (apInfo->SSID == essid) {
- list.append(apInfo);
+ if (deviceConnMan)
+ {
+ TDENetworkHWNeighbor* neighbor;
+ TDENetworkHWNeighborList* neighbors = deviceConnMan->siteSurvey();
+ for (neighbor = neighbors->first(); neighbor; neighbor = neighbors->next())
+ {
+ TDENetworkWiFiAPInfo* apInfo = dynamic_cast<TDENetworkWiFiAPInfo*>(neighbor);
+ if (!apInfo)
+ {
+ continue;
+ }
+ if (apInfo->SSID == essid)
+ {
+ list.append(apInfo);
+ }
}
}
}