From f286a24710f124c8993bc975f95a46de97b5d8a9 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Sat, 18 Apr 2020 00:22:07 +0100
Subject: [PATCH] Ensure that break lines are printed when decoder is aborted

This  change  also  moves  some   other  decode  finished  logic  into
MainWindow::decodeDone().
---
 widgets/mainwindow.cpp | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 79a04b037..174796123 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -1411,6 +1411,7 @@ void MainWindow::dataSink(qint64 frames)
     if(m_ihsym==40 and m_decoderBusy) {
       qDebug() << "ff Clearing hung decoder status";
       decodeDone();  //Clear a hung decoder status
+      m_blankLine=true;
     }
   }
 
@@ -2084,6 +2085,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
     case Qt::Key_Z:                            //### Recover from hung decode() ?? ###
       if(e->modifiers() & Qt::AltModifier) {
         decodeDone();
+        m_blankLine=true;
         return;
       }
     break;    case Qt::Key_PageUp:
@@ -3070,6 +3072,18 @@ void MainWindow::to_jt9(qint32 n, qint32 istart, qint32 idone)
 
 void MainWindow::decodeDone ()
 {
+  if(m_mode!="FT8" or dec_data.params.nzhsym==50) m_nDecodes=0;
+  if(m_mode=="QRA64") m_wideGraph->drawRed(0,0);
+  auto tnow = QDateTime::currentDateTimeUtc ();
+  double tdone = fmod(double(tnow.time().second()),m_TRperiod);
+  int mswait;
+  if( tdone < 0.5*m_TRperiod ) {
+    mswait = 1000.0 * ( 0.75 * m_TRperiod - tdone );
+  } else {
+    mswait = 1000.0 * ( 1.75 * m_TRperiod - tdone );
+  }
+  if(!m_diskData) killFileTimer.start(mswait); //Kill at 3/4 period
+
   dec_data.params.nagain=0;
   dec_data.params.ndiskdat=0;
   m_nclearave=0;
@@ -3084,6 +3098,12 @@ void MainWindow::decodeDone ()
   }
   if(SpecOp::FOX == m_config.special_op_id()) houndCallers();
   to_jt9(m_ihsym,-1,1);                //Tell jt9 we know it has finished
+
+  m_startAnother=m_loopall;
+  if(m_bNoMoreFiles) {
+    MessageBox::information_message(this, tr("No more files to open."));
+    m_bNoMoreFiles=false;
+  }
 }
 
 void MainWindow::readFromStdout()                             //readFromStdout
@@ -3102,24 +3122,8 @@ void MainWindow::readFromStdout()                             //readFromStdout
     int navg=0;
 
     if(line_read.indexOf("<DecodeFinished>") >= 0) {
-      if(m_mode!="FT8" or dec_data.params.nzhsym==50) m_nDecodes=0;
-      if(m_mode=="QRA64") m_wideGraph->drawRed(0,0);
       m_bDecoded =  line_read.mid(20).trimmed().toInt() > 0;
-      auto tnow = QDateTime::currentDateTimeUtc ();
-      double tdone = fmod(double(tnow.time().second()),m_TRperiod);
-      int mswait;
-      if( tdone < 0.5*m_TRperiod ) {
-        mswait = 1000.0 * ( 0.75 * m_TRperiod - tdone );
-      } else {
-        mswait = 1000.0 * ( 1.75 * m_TRperiod - tdone );
-      }
-      if(!m_diskData) killFileTimer.start(mswait); //Kill at 3/4 period
       decodeDone ();
-      m_startAnother=m_loopall;
-      if(m_bNoMoreFiles) {
-        MessageBox::information_message(this, tr("No more files to open."));
-        m_bNoMoreFiles=false;
-      }
       return;
     } else {
       m_nDecodes+=1;