From efda5c30fc737a49920900ace57a6bfffb9be27b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 10 Jul 2013 00:57:41 -0500
Subject: Select any available wireless network in findAccessPointByBSSID This
 resolves Bug 1496

---
 tdecore/tdenetworkconnections.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tdecore/tdenetworkconnections.cpp b/tdecore/tdenetworkconnections.cpp
index e29ec7911..6227b095f 100644
--- a/tdecore/tdenetworkconnections.cpp
+++ b/tdecore/tdenetworkconnections.cpp
@@ -1089,7 +1089,10 @@ TDENetworkWiFiAPInfo* TDEGlobalNetworkManager::findAccessPointByBSSID(TDEMACAddr
 		TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(*it);
 		if (dev) {
 			TDENetworkConnectionManager* deviceConnMan = dev->connectionManager();
-			ret = deviceConnMan->findAccessPointByBSSID(bssid);
+			TDENetworkWiFiAPInfo* candidate = deviceConnMan->findAccessPointByBSSID(bssid);
+			if (candidate) {
+				ret = candidate;
+			}
 		}
 	}
 
-- 
cgit v1.2.1