mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'check/pu-cc' into master

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp
	src/neutrino.cpp
This commit is contained in:
Stefan Seyfried
2013-04-13 17:17:30 +02:00
parent fa87c27dfe 4b624f88bd
commit 61bf95f552
15 changed files with 123 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

@@ -654,6 +654,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.mode_clock = configfile.getInt32( "mode_clock", 0);
g_settings.zapto_pre_time = configfile.getInt32( "zapto_pre_time", 0);
g_settings.spectrum = configfile.getBool("spectrum" , false);
g_settings.eventlist_additional = configfile.getInt32("eventlist_additional", 0);
g_settings.channellist_additional = configfile.getInt32("channellist_additional", 0); //default off
g_settings.channellist_epgtext_align_right = configfile.getBool("channellist_epgtext_align_right" , false);
g_settings.channellist_extended = configfile.getBool("channellist_extended" , true);
@@ -1086,6 +1087,7 @@ void CNeutrinoApp::saveSetup(const char * fname)
configfile.setInt32( "mode_clock", g_settings.mode_clock );
configfile.setInt32( "zapto_pre_time", g_settings.zapto_pre_time );
configfile.setBool("spectrum", g_settings.spectrum);
configfile.setInt32("eventlist_additional", g_settings.eventlist_additional);
configfile.setInt32("channellist_additional", g_settings.channellist_additional);
configfile.setBool("channellist_epgtext_align_right", g_settings.channellist_epgtext_align_right);
configfile.setBool("channellist_extended" , g_settings.channellist_extended);
@@ -3060,7 +3062,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
//CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_MAINMENU_SHUTDOWN));
#if HAVE_COOL_HARDWARE
my_system(2,"/etc/init.d/rcK");
my_system("/etc/init.d/rcK");
sync();
my_system(2,"/bin/umount", "-a");
sleep(1);