From 4fc0831f4a2cd3fc3782f8b946d0bf9274441602 Mon Sep 17 00:00:00 2001
From: thedoc <thedoc@atom.(none)>
Date: Fri, 1 Jan 2010 14:43:26 +0100
Subject: [PATCH] fixes bug #369 close ChannelSelection after PiP is activated

---
 lib/python/Screens/ChannelSelection.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index e8bbce15..36a54e77 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -208,7 +208,7 @@ class ChannelContextMenu(Screen):
 		if self.session.pip.playService(newservice):
 			self.session.pipshown = True
 			self.session.pip.servicePath = self.csel.getCurrentServicePath()
-			self.close()
+			self.close(True)
 		else:
 			self.session.pipshown = False
 			del self.session.pip
@@ -672,7 +672,11 @@ class ChannelSelectionEdit:
 			self.entry_marked = True
 
 	def doContext(self):
-		self.session.open(ChannelContextMenu, self)
+		self.session.openWithCallback(self.exitContext, ChannelContextMenu, self)
+		
+	def exitContext(self, close = False):
+		if close:
+			self.cancel()
 
 MODE_TV = 0
 MODE_RADIO = 1
-- 
2.30.2