w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-21 19:55:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a couple of merging mishaps

Browse Source
This commit is contained in:
Bill Somerville 2019-11-25 15:04:51 +00:00
parent fb1b2e7687
commit 00f39e3ea0
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configuration.ui
View File

@ -3100,7 +3100,5 @@ Right click for insert and delete options.</string>
<buttongroup name="CAT_stop_bits_button_group"/> <buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/> <buttongroup name="TX_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/> <buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
</buttongroups> </buttongroups>
</ui> </ui>

2
Transceiver/HRDTransceiver.cpp
View File

@ -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); auto radio_name = send_command ("get radio", true, current_radio_, true);
qDebug () << "HRDTransceiver::send_command: radio_name:" << radio_name; 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; return std::get<1> (radio) == radio_name;
}); });