diff --git a/src/eitd/sectionsd.cpp b/src/eitd/sectionsd.cpp index fe7c7106d..50e1522da 100644 --- a/src/eitd/sectionsd.cpp +++ b/src/eitd/sectionsd.cpp @@ -1030,6 +1030,7 @@ static void commandDumpStatusInformation(int /*connfd*/, char* /*data*/, const u "Current time: %s" "Hours to cache: %ld\n" "Hours to cache extended text: %ld\n" + "Events to cache: %u\n" "Events are old %ldmin after their end time\n" "Number of cached services: %u\n" "Number of cached nvod-services: %u\n" @@ -1043,7 +1044,7 @@ static void commandDumpStatusInformation(int /*connfd*/, char* /*data*/, const u "" #endif ,ctime(&zeit), - secondsToCache / (60*60L), secondsExtendedTextCache / (60*60L), oldEventsAre / 60, anzServices, anzNVODservices, anzEvents, anzNVODevents, anzMetaServices + secondsToCache / (60*60L), secondsExtendedTextCache / (60*60L), max_events, oldEventsAre / 60, anzServices, anzNVODservices, anzEvents, anzNVODevents, anzMetaServices // resourceUsage.ru_maxrss, resourceUsage.ru_ixrss, resourceUsage.ru_idrss, resourceUsage.ru_isrss, ); printf("%s\n", stati); diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 00498a909..e8dfa6485 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -274,17 +274,8 @@ int CMiscMenue::showMiscSettingsMenu() int res = misc_menue.exec(NULL, ""); - g_settings.epg_cache = atoi(epg_cache.c_str()); - g_settings.epg_extendedcache = atoi(epg_extendedcache.c_str()); - g_settings.epg_old_events = atoi(epg_old_events.c_str()); - g_settings.epg_max_events = atoi(epg_max_events.c_str()); - delete fanNotifier; delete sectionsdConfigNotifier; -#if 0 - if(cs_get_revision() > 7) - delete miscNotifier; -#endif delete miscEpgNotifier; delete miscEpgScanNotifier; return res; diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 382710c69..1c296f264 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -104,8 +104,18 @@ void COnOffNotifier::addItem(CMenuItem* menuItem) toDisable.push_back(menuItem); } -bool CSectionsdConfigNotifier::changeNotify(const neutrino_locale_t, void *) +bool CSectionsdConfigNotifier::changeNotify(const neutrino_locale_t locale, void *data) { + char *str = (char*) data; + if (locale == LOCALE_MISCSETTINGS_EPG_CACHE) + g_settings.epg_cache = atoi(str); + else if (locale == LOCALE_MISCSETTINGS_EPG_EXTENDEDCACHE) + g_settings.epg_extendedcache = atoi(str); + else if (locale == LOCALE_MISCSETTINGS_EPG_OLD_EVENTS) + g_settings.epg_old_events = atoi(str); + else if (locale == LOCALE_MISCSETTINGS_EPG_MAX_EVENTS) + g_settings.epg_max_events = atoi(str); + CNeutrinoApp::getInstance()->SendSectionsdConfig(); return false; }