mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Commit: e0364d9b3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)
This commit is contained in:
@@ -2327,6 +2327,9 @@ TIMER_START();
|
||||
cs_new_auto_videosystem();
|
||||
#endif
|
||||
|
||||
#if !HAVE_COOL_HARDWARE
|
||||
g_info.hw_caps = get_hwcaps();
|
||||
#endif
|
||||
g_Locale = new CLocaleManager;
|
||||
|
||||
int loadSettingsErg = loadSetup(NEUTRINO_SETTINGS_FILE);
|
||||
@@ -2428,8 +2431,10 @@ TIMER_START();
|
||||
|
||||
CheckFastScan();
|
||||
|
||||
#if HAVE_COOL_HARDWARE
|
||||
// init hw_caps *after* zapit start!
|
||||
g_info.hw_caps = get_hwcaps();
|
||||
#endif
|
||||
|
||||
//timer start
|
||||
long timerd_signal = 0;
|
||||
|
Reference in New Issue
Block a user