Ticket #4510: duplicates.diff
File duplicates.diff, 978 bytes (added by , 16 years ago) |
---|
-
guidegrid.cpp
old new void GuideGrid::fillChannelInfos(bool go 840 840 const uint_list_t &ndups = channum_to_index_map[channels[i].channum]; 841 841 for (uint j = 0; j < ndups.size(); j++) 842 842 { 843 if (channels[i].chanid != m_channelInfos[ndups[j]][0].chanid) 843 if ((channels[i].chanid != m_channelInfos[ndups[j]][0].chanid) && 844 !channels[i].callsign.compare(m_channelInfos[ndups[j]][0].callsign)) 844 845 m_channelInfos[ndups[j]].push_back(channels[i]); 845 846 } 846 847 const uint_list_t &cdups = callsign_to_index_map[channels[i].callsign];848 for (uint j = 0; j < cdups.size(); j++)849 {850 if (channels[i].chanid != m_channelInfos[cdups[j]][0].chanid)851 m_channelInfos[cdups[j]].push_back(channels[i]);852 }853 854 847 } 855 848 856 849 if (m_channelInfos.empty())