From c376ffe7dd81ae4f836910f371dd879934afe199 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Thu, 22 Jan 2015 00:45:11 +0000 Subject: [PATCH] The +2kHz check box should not adjust the frequency when starting up Since the last monitored dial frequency is stored and restored from the settings the +2kHz setting should only set the state of the check box when initializing and not attempt to adjust the dial frequency. Merged from the wsjtx-1.4 branch. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4903 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2f44fc6c6..593de02cf 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2861,24 +2861,28 @@ void MainWindow::on_cbTxLock_clicked(bool checked) void MainWindow::on_cbPlus2kHz_toggled(bool checked) { - // Upload any queued spots before changing band - psk_Reporter->sendReport(); - m_plus2kHz = checked; - auto f = m_dialFreq; - - if (m_plus2kHz) + if (m_config.transceiver_online (false)) // only update state if not + // starting up { - f += 2000; - } - else - { - f -= 2000; - } + // Upload any queued spots before changing band + psk_Reporter->sendReport(); - m_bandEdited = true; - band_changed (f); + auto f = m_dialFreq; + + if (m_plus2kHz) + { + f += 2000; + } + else + { + f -= 2000; + } + + m_bandEdited = true; + band_changed (f); + } } void MainWindow::handle_transceiver_update (Transceiver::TransceiverState s)