From 78dc8c1ed39785807f8c99a3522ffb904f84d4ab Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 24 Dec 2014 14:52:57 +0100 Subject: [PATCH] fix sort freq with negative satellite position Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/7b356ad58f79022121cee74f38cd6023b72d4590 Author: Jacek Jendrzej Date: 2014-12-24 (Wed, 24 Dec 2014) --- src/zapit/include/zapit/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zapit/include/zapit/channel.h b/src/zapit/include/zapit/channel.h index b3c020d9e..ccdc4cd85 100644 --- a/src/zapit/include/zapit/channel.h +++ b/src/zapit/include/zapit/channel.h @@ -315,7 +315,7 @@ struct CmpChannelByFreq: public std::binary_function getTransponderId() == c2->getTransponderId()) && ((uint64_t)c1->getFreqId() <<32 | c1->polarization <<16 | c1->getSatellitePosition()) == ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16| c2->getSatellitePosition())) return std::lexicographical_compare(c1->getName().begin(), c1->getName().end(), c2->getName().begin(), c2->getName().end(), comparetolower); else - return ((uint64_t)c1->getFreqId()<<32 | c1->polarization <<16 | c1->getSatellitePosition()) < ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16 | c2->getSatellitePosition()); + return ((uint64_t)c1->getFreqId()<<32 | c1->polarization <<16 | abs(c1->getSatellitePosition())) < ((uint64_t)c2->getFreqId()<<32 | c2->polarization <<16 | abs(c2->getSatellitePosition())); ; }; };