Repair a defect in band/mode matching in the frequency list

This defect could cause the  incorrect number of columns and incorrect
column headings in the WSPR Band Hopping schedule settings.
This commit is contained in:
Bill Somerville 2021-04-21 19:33:52 +01:00
parent 46333a228d
commit 7f47e67026
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 5 additions and 2 deletions

View File

@ -965,8 +965,11 @@ auto FrequencyList_v2::all_bands (Region region, Mode mode) const -> BandSet
BandSet result;
for (auto const& item : m_->frequency_list_)
{
if (region == IARURegions::ALL || item.region_ == region
|| mode == Modes::ALL || item.mode_ == mode)
// Match frequencies that are for all regions, for the specified
// region (which can also be "all"), and where the mode matches
// the specified mode (which can also be "all").
if ((region == IARURegions::ALL || item.region_ == IARURegions::ALL || item.region_ == region)
&& (mode == Modes::ALL || item.mode_ == Modes::ALL || item.mode_ == mode))
{
result << m_->bands_->find (item.frequency_);
}