From 00f39e3ea0c8a96151cbd20383206d3add107628 Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Mon, 25 Nov 2019 15:04:51 +0000
Subject: [PATCH] Fix a couple of merging mishaps

---
 Configuration.ui               | 2 --
 Transceiver/HRDTransceiver.cpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/Configuration.ui b/Configuration.ui
index 0819fd872..53091a905 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -3100,7 +3100,5 @@ Right click for insert and delete options.</string>
   <buttongroup name="CAT_stop_bits_button_group"/>
   <buttongroup name="TX_mode_button_group"/>
   <buttongroup name="TX_audio_source_button_group"/>
-  <buttongroup name="split_mode_button_group"/>
-  <buttongroup name="CAT_data_bits_button_group"/>
  </buttongroups>
 </ui>
diff --git a/Transceiver/HRDTransceiver.cpp b/Transceiver/HRDTransceiver.cpp
index 788313b47..82ed7bc9c 100644
--- a/Transceiver/HRDTransceiver.cpp
+++ b/Transceiver/HRDTransceiver.cpp
@@ -1025,7 +1025,7 @@ QString HRDTransceiver::send_command (QString const& cmd, bool no_debug, bool pr
     {
       auto radio_name = send_command ("get radio", true, current_radio_, true);
       qDebug () << "HRDTransceiver::send_command: radio_name:" << radio_name;
-      auto radio_iter = std::find_if (radios_.begin (), radios_.end (), [this, &radio_name] (RadioMap::value_type const& radio)
+      auto radio_iter = std::find_if (radios_.begin (), radios_.end (), [&radio_name] (RadioMap::value_type const& radio)
                                       {
                                         return std::get<1> (radio) == radio_name;
                                       });