w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-01 05:32:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.4.0' into develop

Browse Source
This commit is contained in:
Bill Somerville 2021-04-21 19:36:37 +01:00
commit f289bb06bb
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/q65_decode.f90
View File

@ -341,8 +341,7 @@ contains
endif endif
endif endif
enddo ! icand enddo ! icand
if(iavg.eq.0 .and.navg(iseq).ge.2) go to 50 if(iavg.eq.0 .and.navg(iseq).ge.2 .and. iand(ndepth,16).ne.0) go to 50
900 return 900 return
end subroutine decode end subroutine decode

7
models/FrequencyList.cpp
View File

@ -965,8 +965,11 @@ auto FrequencyList_v2::all_bands (Region region, Mode mode) const -> BandSet
BandSet result; BandSet result;
for (auto const& item : m_->frequency_list_) for (auto const& item : m_->frequency_list_)
{ {
if (region == IARURegions::ALL || item.region_ == region // Match frequencies that are for all regions, for the specified
|| mode == Modes::ALL || item.mode_ == mode) // 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_); result << m_->bands_->find (item.frequency_);
} }