Merge remote-tracking branch 'origin/master'

DonDavici · Mar 29, 2015 · 7dbac3e · 7dbac3e
2 parents a3ac037 + e335ed7
commit 7dbac3e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/DP_MainMenu.py b/src/DP_MainMenu.py
@@ -44,7 +44,7 @@
 from DPH_WOL import wake_on_lan
 from DPH_ScreenHelper import DPH_ScreenHelper, DPH_Screen
 
-from __common__ import printl2 as printl, testPlexConnectivity, testInetConnectivity
+from __common__ import printl2 as printl, testPlexConnectivity, testInetConnectivity, saveLiveTv
 from __plugin__ import Plugin
 from __init__ import _ # _ is translation
 
@@ -78,6 +78,9 @@ def __init__(self, session, allowOverride=True):
 		printl("selectionOverride:" +str(self.selectionOverride), self, "D")
 		self.session = session
 
+		# save liveTvData
+		saveLiveTv(self.session.nav.getCurrentlyPlayingServiceReference())
+
 		self.initScreen("main_menu")
 		self.initMenu()
 

diff --git a/src/plugin.py b/src/plugin.py
@@ -18,8 +18,6 @@
 from __init__ import prepareEnvironment, startEnvironment, _ # _ is translation
 from __common__ import getUUID, saveLiveTv, getLiveTv, getOeVersion, getBoxResolution
 
-from enigma import getDesktop
-
 #===============================================================================
 # GLOBALS
 #===============================================================================
@@ -44,10 +42,7 @@ def main(session, **kwargs):
 def DPS_MainMenu(*args, **kwargs):
 	import DP_MainMenu
 
-	# save liveTvData
-	saveLiveTv(global_session.nav.getCurrentlyPlayingServiceReference())
-
-	# this loads the skin
+ 	# this loads the skin
 	startEnvironment()
 
 	return DP_MainMenu.DPS_MainMenu(*args, **kwargs)