X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FPlugins%2FSystemPlugins%2FWirelessLan%2Fplugin.py;fp=lib%2Fpython%2FPlugins%2FSystemPlugins%2FWirelessLan%2Fplugin.py;h=6bfaec528afed51073c9a388a51586256f449426;hp=a78857a674632ac0869d76e8ed71ee0763374072;hb=defadb893d6897935165b63a9de09b95f43dfcc1;hpb=46b2ddde6868639c2c437f1bed6d6db27a71038d

diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
index a78857a..6bfaec5 100755
--- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
@@ -130,7 +130,7 @@ class WlanStatus(Screen):
 
 	def exit(self):
 		self.timer.stop()
-		self.close()	
+		self.close(True)	
 
 	def updateStatusbar(self):
 		self["BSSID"].setText(_("Please wait..."))
@@ -262,8 +262,11 @@ class WlanScan(Screen):
 		self.updateAPList()
 
 	def buildEntryComponent(self, essid, bssid, encrypted, iface, maxrate, signal):
+<<<<<<< HEAD:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
 		print "buildEntryComponent",essid
 		print "buildEntryComponent",bssid
+=======
+>>>>>>> origin/bug_203_fix_wrong_networkstate:lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
 		divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/div-h.png"))
 		encryption = encrypted and _("Yes") or _("No")
 		if bssid == 'hidden...':