From 71874b399aad04a43a25fe45f236c74e52ee514a Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 13 Jan 2013 21:45:08 +0100 Subject: [PATCH] src/neutrino.cpp: revert Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/be0eb77373d4bf3d864196fe52959afd546bd322 Author: Jacek Jendrzej Date: 2013-01-13 (Sun, 13 Jan 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index fff0e4624..572961e7f 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1820,10 +1820,7 @@ 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; g_info.delivery_system = CFEManager::getInstance()->getLiveFE()->getInfo()->type == FE_QPSK ? DVB_S : DVB_C; #if HAVE_TRIPLEDRAGON