From b19104fa07b28d562400e74cf5668f7fdbd82d85 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Thu, 8 Sep 2011 17:30:14 +0000 Subject: [PATCH] zapit:scan -fix abort ScanTransponder with NIT git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1678 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/fd66792efef23e517aa0e23dfb00079457dbca7b Author: Jacek Jendrzej Date: 2011-09-08 (Thu, 08 Sep 2011) --- src/zapit/src/scan.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/zapit/src/scan.cpp b/src/zapit/src/scan.cpp index 67e4f0ccf..4319c1eff 100644 --- a/src/zapit/src/scan.cpp +++ b/src/zapit/src/scan.cpp @@ -259,7 +259,7 @@ _repeat: #ifdef NIT_THREAD pthread_t nthread; - if(scan_nit) + if(!scan_nit) if(pthread_create(&nthread, 0, nit_thread, (void*)satellitePosition)) { ERROR("pthread_create"); nthread = 0; @@ -300,12 +300,12 @@ _repeat: stI->second.feparams.u.qpsk.fec_inner = tI->second.feparams.u.qpsk.fec_inner; #ifdef NIT_THREAD - if(scan_nit && nthread) { + if(!scan_nit && nthread) { if(pthread_join(nthread, NULL)) perror("pthread_join !!!!!!!!!"); } #else - if(scan_nit) { + if(!scan_nit) { printf("[scan] trying to parse NIT\n"); int status = parse_nit(satellitePosition, freq /*tI->second.feparams.frequency/1000*/); if(status < 0) @@ -314,7 +314,7 @@ _repeat: #endif printf("[scan] tpid ready: %llx\n", TsidOnid); } - if(scan_nit) { + if(!scan_nit) { printf("[scan] found %d transponders (%d failed) and %d channels\n", found_transponders, failed_transponders, found_channels); scantransponders.clear(); for (tI = nittransponders.begin(); tI != nittransponders.end(); tI++) {