From ffe1d11e995146c4f780bd6c35277239c1f8bf1a Mon Sep 17 00:00:00 2001
From: Uwe Risse <dg2ycb@gmx.de>
Date: Tue, 6 Feb 2024 11:06:33 +0100
Subject: [PATCH] Don't fill DX Call box and Std Msgs when double-clicking on a
 combined message and we are on standard FT8 sub-bands.

---
 widgets/mainwindow.cpp | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 0bda00ee3..153ad6f06 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -5515,21 +5515,6 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
   } else {
     cursor=ui->decodedTextBrowser2->textCursor();
   }
-
-  if(modifiers==(Qt::ShiftModifier + Qt::ControlModifier + Qt::AltModifier)) {
-    //### What was the purpose of this ???  ###
-    cursor.setPosition(0);
-  } else {
-    cursor.setPosition(cursor.selectionStart());
-  }
-
-  if(SpecOp::FOX==m_specOp and m_decodedText2) {
-    if(m_houndQueue.count()<10 and m_nSortedHounds>0) {
-      QString t=cursor.block().text();
-      selectHound(t, modifiers==(Qt::AltModifier));  // alt double-click gets put at top of queue
-    }
-    return;
-  }
   DecodedText message {cursor.block().text().trimmed().left(61).remove("TU; ")};
   if(message.string().contains(";") && message.string().contains("<")) {
     QVector<qint32> ft8Freq = {1840000,3573000,7074000,10136000,14074000,18100000,21074000,24915000,28074000,50313000,70154000};
@@ -5544,16 +5529,26 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers)
 //        QTimer::singleShot (0, [=] {               // don't block guiUpdate
 //          MessageBox::warning_message (this, tr ("Potential hash collision"), msg2);
 //        });
-        break;
-      } else {
-          m_bDoubleClicked = true;
-          processMessage (message, modifiers);
-      }
+        return;
+        }
     }
-  } else {
-      m_bDoubleClicked = true;
-      processMessage (message, modifiers);
   }
+  if(modifiers==(Qt::ShiftModifier + Qt::ControlModifier + Qt::AltModifier)) {
+    //### What was the purpose of this ???  ###
+    cursor.setPosition(0);
+  } else {
+    cursor.setPosition(cursor.selectionStart());
+  }
+
+  if(SpecOp::FOX==m_specOp and m_decodedText2) {
+    if(m_houndQueue.count()<10 and m_nSortedHounds>0) {
+      QString t=cursor.block().text();
+      selectHound(t, modifiers==(Qt::AltModifier));  // alt double-click gets put at top of queue
+    }
+    return;
+  }
+  m_bDoubleClicked = true;
+  processMessage (message, modifiers);
 }
 
 void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifiers modifiers)