From 73f8e93eb93ac29a012c400f10651cdb881f1d3e Mon Sep 17 00:00:00 2001
From: Bill Somerville <g4wjs@classdesign.com>
Date: Sun, 16 Jul 2017 21:44:32 +0000
Subject: [PATCH] merged from trunk:
 ------------------------------------------------------------------------
 r7918 | bsomervi | 2017-07-16 22:42:09 +0100 (Sun, 16 Jul 2017) | 1 line

Do not show 1st Call checkbox in MSK144 mode
------------------------------------------------------------------------
r7919 | bsomervi | 2017-07-16 22:42:18 +0100 (Sun, 16 Jul 2017) | 1 line

Do not change anything if the settings dialog is cancelled
------------------------------------------------------------------------



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7920 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 mainwindow.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 607299a7e..2e5db4adc 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);
+    }
   }
 }
 
@@ -4638,9 +4638,9 @@ void MainWindow::on_actionISCAT_triggered()
 
 void MainWindow::on_actionMSK144_triggered()
 {
+  m_mode="MSK144";
   displayWidgets(nWidgets("101111110100000000010001"));
 //    displayWidgets(nWidgets("101111111100000000010001"));
-  m_mode="MSK144";
   m_modeTx="MSK144";
   ui->actionMSK144->setChecked(true);
   switch_mode (Modes::MSK144);
@@ -4759,8 +4759,8 @@ void MainWindow::on_actionEcho_triggered()
 void MainWindow::on_actionFreqCal_triggered()
 {
   on_actionJT9_triggered();
-  displayWidgets(nWidgets("001101000000000000000000"));
   m_mode="FreqCal";
+  displayWidgets(nWidgets("001101000000000000000000"));
   ui->actionFreqCal->setChecked(true);
   switch_mode(Modes::FreqCal);
   m_wideGraph->setMode(m_mode);