mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/mp

Browse Source 
except 3e0a8d3ff0 2d4130dab8


Origin commit data
------------------
Commit: fb23ac0126
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)
This commit is contained in:
Jacek Jendrzej
2017-05-10 15:37:31 +02:00
parent cf1b8ce7ec 19b084cb4c
commit e6f3ee9c94
9 changed files with 87 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/neutrino.cpp
View File

@@ -476,8 +476,16 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.hdd_noise = configfile.getInt32( "hdd_noise", 254);
g_settings.hdd_statfs_mode = configfile.getInt32( "hdd_statfs_mode", SNeutrinoSettings::HDD_STATFS_RECORDING);
/*
hw_caps needs CFEManager and CFEManager needs g_settings.
So loadSetup() cannot use hw_caps to init g_settings.
For this reason we need this workaround.
*/
bool can_shutdown = (cs_get_revision() > 7);
g_settings.shutdown_real = false;
if (g_info.hw_caps->can_shutdown)
if (can_shutdown) //(g_info.hw_caps->can_shutdown)
g_settings.shutdown_real = configfile.getBool("shutdown_real" , false );
g_settings.shutdown_real_rcdelay = configfile.getBool("shutdown_real_rcdelay", false );
g_settings.shutdown_count = configfile.getInt32("shutdown_count", 0);
@@ -2173,6 +2181,9 @@ TIMER_START();
CheckFastScan();
// init hw_caps *after* zapit start!
g_info.hw_caps = get_hwcaps();
//timer start
long timerd_signal = 0;
timer_wakeup = false;//init