Merge branch 'epg-rewrite' into initialscan

This commit is contained in:
Adam Sutton 2012-06-29 22:02:55 +01:00
commit a7debdc593

View file

@ -836,14 +836,14 @@ void opentv_init ( void )
/* Load dictionaries */
if ((m = hts_settings_load("epggrab/opentv/dict")))
_opentv_dict_load(m);
if ((m = hts_settings_load("%sdata/epggrab/opentv/dict", dr)))
if ((m = hts_settings_load("%s/data/epggrab/opentv/dict", dr)))
_opentv_dict_load(m);
tvhlog(LOG_INFO, "opentv", "dictonaries loaded");
/* Load providers */
if ((m = hts_settings_load("epggrab/opentv/prov")))
_opentv_prov_load(m);
if ((m = hts_settings_load("%sdata/epggrab/opentv/prov", dr)))
if ((m = hts_settings_load("%s/data/epggrab/opentv/prov", dr)))
_opentv_prov_load(m);
tvhlog(LOG_INFO, "opentv", "providers loaded");
}