Merge branch 'master' into obi/master

Conflicts:
	main/Makefile.am

1 files changed, 3 insertions, 1 deletions

diff --git a/mytest.py b/mytest.py
index d34924be..7a8d7b70 100755
--- a/mytest.py
+++ b/mytest.py
@@ -60,7 +60,7 @@ config.misc.epgcache_filename = ConfigText(default = "/hdd/epg.dat")
 
 def setEPGCachePath(configElement):
 	eEPGCache.getInstance().setCacheFile(configElement.value)
-config.misc.epgcache_filename.addNotifier(setEPGCachePath)
+
 
 #demo code for use of standby enter leave callbacks
 #def leaveStandby():
@@ -478,6 +478,8 @@ def runScreenTest():
 		else:
 			session.open(screen, *args)
 
+	config.misc.epgcache_filename.addNotifier(setEPGCachePath)
+
 	runNextScreen(session, screensToRun)
 
 	profile("Init:VolumeControl")