Changeset 114

Author: Fate

(2010/04/04 12:32) About 2 years ago

Fixed a crash when connman has fake device plugin...
thanks to misc.

Affected files

 		self.device = None
 		for dpath in self.bus["connman"]["/"]["Manager"]["Devices"]:
 			device = self.bus["connman"][dpath]["Device"]
-			if device["Type"] == "wifi":
+			try:
-				self.device = device
+				if device["Type"] == "wifi":
+					self.device = device
+			except KeyError:
+				pass
 	def ScanClicked(self,*args,**kwargs):
 		# check power state and see if we find the device
 	def _GetDevice(self):
 		# find wifi device
 		self.device = None
-		try:
+		for dpath in self.bus["connman"]["/"]["Manager"]["Devices"]:
-			for dpath in self.bus["connman"]["/"]["Manager"]["Devices"]:
+			device = self.bus["connman"][dpath]["Device"]
-				device = self.bus["connman"][dpath]["Device"]
+			try:
 				if device["Type"] == "wifi":
 					self.device = device
-		except:
+			except KeyError:
-			pass
+				pass
 	def _GetBroadcast(self):
 		ipb = socket.inet_aton(self.panels[2].config["ip"])