From 6933710b3eab806151f6352d3b1a228fb72a3e96 Mon Sep 17 00:00:00 2001
From: acid-burn <acidburn@opendreambox.org>
Date: Fri, 14 Nov 2008 08:24:36 +0100
Subject: [PATCH] small skin fix fix possible crash when leaving networksetup

---
 data/skin_default.xml              | 4 ++--
 lib/python/Components/Network.py   | 1 +
 lib/python/Screens/NetworkSetup.py | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 41a7e4c9..993fd320 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -37,13 +37,13 @@
 		<widget name="BottomBG" pixmap="skin_default/bottombar.png" position="5,310" size="540,120" zPosition="1" transparent="1" alphatest="on" />
 		<widget name="Adaptertext" position="20,325" size="100,21" zPosition="10" font="Regular;19" transparent="1" />
 		<widget name="Adapter" position="110,325" size="300,21" zPosition="10" font="Regular;19" transparent="1" />
-		<widget name="introduction2" position="110,360" size="300,20" zPosition="10" font="Regular;21" halign="center" transparent="1" />
+		<widget name="introduction2" position="90,360" size="300,20" zPosition="10" font="Regular;21" halign="center" transparent="1" />
 		<widget name="ButtonRedtext" position="410,325" size="140,21" zPosition="10" font="Regular;21" transparent="1" />
 		<widget name="ButtonRed" pixmap="skin_default/buttons/button_red.png" position="390,325" zPosition="10" size="15,16" transparent="1" alphatest="on" />
 		<widget name="ButtonBluetext" position="410,360" size="140,21" zPosition="10" font="Regular;21" transparent="1" />
 		<widget name="ButtonBlue" pixmap="skin_default/buttons/button_blue.png" position="390,360" zPosition="10" size="15,16" transparent="1" alphatest="on" />
 		<widget name="ButtonGreen" pixmap="skin_default/buttons/button_green.png" position="20,360" zPosition="10" size="15,16" transparent="1" alphatest="on" />
-		<widget name="VKeyIcon" pixmap="skin_default/vkey_icon.png" position="40,340" zPosition="10" size="60,48" transparent="1" alphatest="on" />
+		<widget name="VKeyIcon" pixmap="skin_default/vkey_icon.png" position="35,340" zPosition="10" size="60,48" transparent="1" alphatest="on" />
 		<widget name="HelpWindow" pixmap="skin_default/vkey_icon.png" position="120,245" zPosition="1" size="1,1" transparent="1" alphatest="on" />	
 	</screen>
 	<screen name="AdapterSetupConfiguration" position="90,100" size="550,400" title="Network Configuration..." >
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 7cc61d84..53b487d5 100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -63,6 +63,7 @@ class Network:
 
 	def getDataForInterface(self, iface,callback):
 		#get ip out of ip addr, as avahi sometimes overrides it in ifconfig.
+		self.Console = Console()
 		cmd = "ip -o addr"
 		self.Console.ePopen(cmd, self.IPaddrFinished, [iface,callback])
 
diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index 588a46ff..32e2dafd 100755
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -174,6 +174,7 @@ class NetworkAdapterSelection(Screen,HelpableScreen):
 	def cleanup(self):
 		iNetwork.stopLinkStateConsole()
 		iNetwork.stopRestartConsole()
+		iNetwork.stopGetInterfacesConsole()
 
 	def restartLan(self):
 		iNetwork.restartNetwork(self.restartLanDataAvail)
-- 
2.30.2