From afddcb8bb43f151cd6cabc21e3fec3b39896a806 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Mon, 9 Jan 2017 22:54:32 +0000 Subject: [PATCH] Skip all mode working frequencies in FreqCal mode git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7468 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index e7b5afbc8..9354a4951 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -219,7 +219,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, m_nWSPRdecodes {0}, m_k0 {9999999}, m_nPick {0}, - m_frequency_list_fcal_iter {m_config.frequencies ()->end ()}, + m_frequency_list_fcal_iter {m_config.frequencies ()->begin ()}, m_TRperiodFast {-1}, m_nTx73 {0}, m_btxok {false}, @@ -6105,7 +6105,11 @@ void MainWindow::on_actionFrequency_calibration_triggered() // pick the next time signal if (m_frequency_list_fcal_iter != m_config.frequencies ()->end ()) { - if (++m_frequency_list_fcal_iter == m_config.frequencies ()->end ()) + while (++m_frequency_list_fcal_iter != m_config.frequencies () ->end () + && m_frequency_list_fcal_iter->mode_ == Modes::NULL_MODE) + { + } + if (m_frequency_list_fcal_iter == m_config.frequencies ()->end ()) { // loop back to beginning m_frequency_list_fcal_iter = m_config.frequencies ()->begin ();