Ticket #4510: duplicates.diff

File duplicates.diff, 978 bytes (added by Mark Buechler <Mark.Buechler@…>, 13 years ago)

Patch to fix duplicate channel callsigns with different channums.

  • guidegrid.cpp

    old new void GuideGrid::fillChannelInfos(bool go 
    840840        const uint_list_t &ndups = channum_to_index_map[channels[i].channum];
    841841        for (uint j = 0; j < ndups.size(); j++)
    842842        {
    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))
    844845                m_channelInfos[ndups[j]].push_back(channels[i]);
    845846        }
    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 
    854847    }
    855848
    856849    if (m_channelInfos.empty())