From 8dcd92d5573c23a83ec4e4c48b330245cbf828a0 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sun, 30 Dec 2012 20:56:19 +0100 Subject: [PATCH] Revert "neutrino: fix segfault if not found frontend" This reverts commit 0806c47c73fb6660ba0eee2a49ef8a197763d9b9. (it does not fix the real problem) --- src/neutrino.cpp | 6 ------ src/zapit/src/getservices.cpp | 3 --- 2 files changed, 9 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index fff0e4624..ec32d4e63 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1819,12 +1819,6 @@ TIMER_START(); cpuFreq = new cCpuFreqManager(); cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000); - - g_info.delivery_system = DVB_S; - if(CFEManager::getInstance()->getLiveFE() != NULL){ - g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C; - } - g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C; #if HAVE_TRIPLEDRAGON /* only SAT-hd1 before rev 8 has fan, rev 1 is TD (compat hack) */ diff --git a/src/zapit/src/getservices.cpp b/src/zapit/src/getservices.cpp index 0aa479238..4255a35bf 100644 --- a/src/zapit/src/getservices.cpp +++ b/src/zapit/src/getservices.cpp @@ -591,9 +591,6 @@ bool CServiceManager::InitSatPosition(t_satellite_position position, char * name bool CServiceManager::LoadServices(bool only_current) { - if(CFEManager::getInstance()->getLiveFE() == NULL) - return false; - xmlDocPtr parser; static bool satcleared = 0;//clear only once, because menu is static service_count = 0;