From 5eab7abed715fdccf487b2c9241ee8ae8e1c70ba Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sun, 16 Jul 2017 21:42:18 +0000 Subject: [PATCH] Do not change anything if the settings dialog is cancelled git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7919 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index cc544057b..d4895cb32 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1574,24 +1574,24 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog if(m_mode=="WSPR-LF") on_actionWSPR_LF_triggered(); if(m_mode=="Echo") on_actionEcho_triggered(); if(b) VHF_features_enabled(b); - } - m_config.transceiver_online (); - if(!m_bFastMode) setXIT (ui->TxFreqSpinBox->value ()); - if(m_config.single_decode() or m_mode=="JT4") { - ui->label_6->setText("Single-Period Decodes"); - ui->label_7->setText("Average Decodes"); - } else { - ui->label_6->setText("Band Activity"); - ui->label_7->setText("Rx Frequency"); - } - update_watchdog_label (); - if(!m_splitMode) ui->cbCQTx->setChecked(false); - if(!m_config.enable_VHF_features()) { - ui->actionInclude_averaging->setEnabled(false); - ui->actionInclude_correlation->setEnabled(false); - ui->actionInclude_averaging->setChecked(false); - ui->actionInclude_correlation->setChecked(false); + m_config.transceiver_online (); + if(!m_bFastMode) setXIT (ui->TxFreqSpinBox->value ()); + if(m_config.single_decode() or m_mode=="JT4") { + ui->label_6->setText("Single-Period Decodes"); + ui->label_7->setText("Average Decodes"); + } else { + ui->label_6->setText("Band Activity"); + ui->label_7->setText("Rx Frequency"); + } + update_watchdog_label (); + if(!m_splitMode) ui->cbCQTx->setChecked(false); + if(!m_config.enable_VHF_features()) { + ui->actionInclude_averaging->setEnabled(false); + ui->actionInclude_correlation->setEnabled(false); + ui->actionInclude_averaging->setChecked(false); + ui->actionInclude_correlation->setChecked(false); + } } }