mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
neutrino.cpp: fix g_info.has_fan init
This commit is contained in:
@@ -1848,6 +1848,7 @@ TIMER_START();
|
|||||||
|
|
||||||
cpuFreq = new cCpuFreqManager();
|
cpuFreq = new cCpuFreqManager();
|
||||||
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
|
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
|
||||||
|
g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
|
||||||
#if HAVE_TRIPLEDRAGON
|
#if HAVE_TRIPLEDRAGON
|
||||||
/* only SAT-hd1 before rev 8 has fan, rev 1 is TD (compat hack) */
|
/* only SAT-hd1 before rev 8 has fan, rev 1 is TD (compat hack) */
|
||||||
g_info.has_fan = (cs_get_revision() > 1 && cs_get_revision() < 8 && g_info.delivery_system == DVB_S);
|
g_info.has_fan = (cs_get_revision() > 1 && cs_get_revision() < 8 && g_info.delivery_system == DVB_S);
|
||||||
@@ -1875,7 +1876,6 @@ TIMER_START();
|
|||||||
CEitManager::getInstance()->Start();
|
CEitManager::getInstance()->Start();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C;
|
|
||||||
if (!scanSettings.loadSettings(NEUTRINO_SCAN_SETTINGS_FILE, g_info.delivery_system)) {
|
if (!scanSettings.loadSettings(NEUTRINO_SCAN_SETTINGS_FILE, g_info.delivery_system)) {
|
||||||
dprintf(DEBUG_NORMAL, "Loading of scan settings failed. Using defaults.\n");
|
dprintf(DEBUG_NORMAL, "Loading of scan settings failed. Using defaults.\n");
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user