diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 3c770670c..e9e3d449f 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -342,8 +342,7 @@ contains endif endif 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 end subroutine decode diff --git a/map65/devsetup.cpp b/map65/devsetup.cpp index 2e223a710..abd0734a9 100644 --- a/map65/devsetup.cpp +++ b/map65/devsetup.cpp @@ -274,6 +274,7 @@ void DevSetup::updateColorLabels() .arg (b3, 2, 16, QLatin1Char {'0'}) ); + m_colors.clear (); QTextStream ots {&m_colors, QIODevice::WriteOnly}; ots.setIntegerBase (16); ots.setFieldWidth (2); 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_); } diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 942729137..5246279d0 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -9214,7 +9214,7 @@ void MainWindow::write_all(QString txRx, QString message) t = t.asprintf("%5d",ui->TxFreqSpinBox->value()); if (txRx=="Tx") msg=" 0 0.0" + t + " " + message; auto time = QDateTime::currentDateTimeUtc (); - if( txRx=="Rx" ) time=m_dateTimeSeqStart; + if( txRx=="Rx" && !m_bFastMode ) time=m_dateTimeSeqStart; t = t.asprintf("%10.3f ",m_freqNominal/1.e6); if (m_diskData) {