From 74d5eff2d7500b1ab712e402cbd3d9e2ac1ebbe3 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Mon, 17 Oct 2016 14:35:59 +0000
Subject: [PATCH] Decode button now does nothing in MSK144 mode.

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

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 2671bb64c..1a02d4051 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2100,11 +2100,15 @@ void MainWindow::on_actionSpecial_mouse_commands_triggered()
 
 void MainWindow::on_DecodeButton_clicked (bool /* checked */)	//Decode request
 {
-  if(!m_mode.startsWith ("WSPR") && !m_decoderBusy) {
-    dec_data.params.newdat=0;
-    dec_data.params.nagain=1;
-    m_blankLine=false; // don't insert the separator again
-    decode();
+  if(m_mode=="MSK144") {
+    ui->DecodeButton->setChecked(false);
+  } else {
+    if(!m_mode.startsWith ("WSPR") && !m_decoderBusy) {
+      dec_data.params.newdat=0;
+      dec_data.params.nagain=1;
+      m_blankLine=false; // don't insert the separator again
+      decode();
+    }
   }
 }
 
@@ -2560,34 +2564,7 @@ void MainWindow::on_EraseButton_clicked()                          //Erase
 
 void MainWindow::decodeBusy(bool b)                             //decodeBusy()
 {
-/* ###   Temporarily(?) disable the long-decode progress bar.
-  bool showProgress = false;
-  if (b && m_firstDecode < 65 && ("JT65" == m_mode || "JT9+JT65" == m_mode))
-    {
-      m_firstDecode += 65;
-      if ("JT9+JT65" == m_mode) m_firstDecode = 65 + 9;
-      showProgress = true;
-    }
-  if (b && m_firstDecode != 9 && m_firstDecode != 65 + 9 &&
-      ("JT9" == m_mode))
-    {
-      m_firstDecode += 9;
-      showProgress = true;
-    }
-  if (showProgress)
-    {
-      // this sequence is needed to create an indeterminate progress
-      // bar
-      m_optimizingProgress.setRange (0, 1);
-      m_optimizingProgress.setValue (0);
-      m_optimizingProgress.setRange (0, 0);
-    }
-### */
-  if (!b)
-    {
-      m_optimizingProgress.reset ();
-    }
-
+  if (!b) m_optimizingProgress.reset ();
   m_decoderBusy=b;
   ui->DecodeButton->setEnabled(!b);
   ui->actionOpen->setEnabled(!b);