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

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

Browse Source 
Origin commit data
------------------
Commit: e0364d9b3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)
This commit is contained in:
vanhofen
2017-08-01 12:36:04 +02:00
parent ff24e343ce 9d6d2daeb7
commit e540017d8b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/neutrino.cpp
View File

@@ -2327,6 +2327,9 @@ TIMER_START();
cs_new_auto_videosystem(); cs_new_auto_videosystem();
#endif #endif
#if !HAVE_COOL_HARDWARE
g_info.hw_caps = get_hwcaps();
#endif
g_Locale = new CLocaleManager; g_Locale = new CLocaleManager;
int loadSettingsErg = loadSetup(NEUTRINO_SETTINGS_FILE); int loadSettingsErg = loadSetup(NEUTRINO_SETTINGS_FILE);
@@ -2428,8 +2431,10 @@ TIMER_START();
CheckFastScan(); CheckFastScan();
#if HAVE_COOL_HARDWARE
// init hw_caps *after* zapit start! // init hw_caps *after* zapit start!
g_info.hw_caps = get_hwcaps(); g_info.hw_caps = get_hwcaps();
#endif
//timer start //timer start
long timerd_signal = 0; long timerd_signal = 0;