Merge branch 'master' into experimental

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 15248a6..8ac0c71 100644 (file)
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -234,15 +234,14 @@ eEPGCache::eEPGCache()
 
 void eEPGCache::setCacheFile(const char *path)
 {
-       if (!strlen(m_filename))
+       bool inited = !!strlen(m_filename);
+       strncpy(m_filename, path, 1024);
+       if (!inited)
        {
-               strncpy(m_filename, path, 1024);
                eDebug("[EPGC] setCacheFile read/write epg data from/to '%s'", m_filename);
                if (eDVBLocalTimeHandler::getInstance()->ready())
                        timeUpdated();
        }
-       else
-               eDebug("[EPGC] setCacheFile already called... ignore '%s'", path);
 }
 
 void eEPGCache::timeUpdated()

diff --git a/mytest.py b/mytest.py
index 92e49ba..d34924b 100755 (executable)
--- a/mytest.py
+++ b/mytest.py
@@ -58,7 +58,9 @@ config.misc.startCounter = ConfigInteger(default=0) # number of e2 starts...
 config.misc.standbyCounter = NoSave(ConfigInteger(default=0)) # number of standby
 config.misc.epgcache_filename = ConfigText(default = "/hdd/epg.dat")
 
-eEPGCache.getInstance().setCacheFile(config.misc.epgcache_filename.value)
+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():