remove ugly HACK

send evEnd in correct order (this assumes that no one need the
currentService after evEnd is dispatched or in the evEnd callback

1 files changed, 3 insertions, 7 deletions

diff --git a/Navigation.py b/Navigation.py
index ece89227..06d47ac4 100644
--- a/Navigation.py
+++ b/Navigation.py
@@ -28,12 +28,10 @@ class Navigation:
 		self.record_event = [ ]
 		self.currentlyPlayingServiceReference = None
 		self.currentlyPlayingService = None
-		self.state = 0
 		self.RecordTimer = RecordTimer.RecordTimer()
 		self.SleepTimer = SleepTimer.SleepTimer()
 
 	def dispatchEvent(self, i):
-		self.state = i != 1
 		for x in self.event:
 			x(i)
 
@@ -91,11 +89,9 @@ class Navigation:
 		return self.pnav and self.pnav.getRecordings()
 
 	def getCurrentService(self):
-		if self.state:
-			if not self.currentlyPlayingService:
-				self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
-			return self.currentlyPlayingService
-		return None
+		if not self.currentlyPlayingService:
+			self.currentlyPlayingService = self.pnav and self.pnav.getCurrentService()
+		return self.currentlyPlayingService
 
 	def stopService(self):
 		print "stopService"