Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Commit: 111ac82c9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)
This commit is contained in:
vanhofen
2017-07-04 14:07:10 +02:00
13 changed files with 71 additions and 38 deletions

View File

@@ -645,6 +645,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.epg_scan = CEpgScan::SCAN_CURRENT;
g_settings.epg_scan_mode = CEpgScan::MODE_OFF;
}
g_settings.epg_scan_rescan = configfile.getInt32("epg_scan_rescan", 24);
g_settings.epg_save_mode = configfile.getInt32("epg_save_mode", 0);
//widget settings
g_settings.widget_fade = false;
@@ -1391,6 +1392,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32("epg_read_frequently", g_settings.epg_read_frequently);
configfile.setInt32("epg_scan", g_settings.epg_scan);
configfile.setInt32("epg_scan_mode", g_settings.epg_scan_mode);
configfile.setInt32("epg_scan_rescan", g_settings.epg_scan_rescan);
configfile.setInt32("epg_save_mode", g_settings.epg_save_mode);
configfile.setInt32("epg_cache_time" ,g_settings.epg_cache );
configfile.setInt32("epg_extendedcache_time" ,g_settings.epg_extendedcache);