From 7f47e67026dc204bcf8f31d95ec3b4f35b997303 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 21 Apr 2021 19:33:52 +0100 Subject: [PATCH] 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. --- models/FrequencyList.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/models/FrequencyList.cpp b/models/FrequencyList.cpp index beae8fd6d..034af8951 100644 --- a/models/FrequencyList.cpp +++ b/models/FrequencyList.cpp @@ -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_); }