w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Repair merging issues

This commit is contained in:
Bill Somerville 2021-03-04 00:10:16 +00:00
parent 22f1ba6a6d
commit a83b8dc5f6
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Transceiver/HamlibTransceiver.cpp
View File

@ -436,7 +436,7 @@ HamlibTransceiver::HamlibTransceiver (logger_type * logger,
{
m_->set_conf ("ptt_type", "RTS");
}
set_conf ("ptt_share", "1");
m_->set_conf ("ptt_share", "1");
}
// do this late to allow any configuration option to be overriden
@ -457,7 +457,7 @@ HamlibTransceiver::HamlibTransceiver (logger_type * logger,
// m_->rig_->state.obj = this;
if (!is_dummy_)
if (!m_->is_dummy_)
{
switch (rig_get_caps_int (m_->model_, RIG_CAPS_PORT_TYPE))
{
@ -551,7 +551,7 @@ HamlibTransceiver::HamlibTransceiver (logger_type * logger,
{
m_->set_conf ("ptt_type", "RTS");
}
set_conf ("ptt_share", "1");
m_->set_conf ("ptt_share", "1");
}
// Make Icom CAT split commands less glitchy
@ -606,8 +606,8 @@ void HamlibTransceiver::load_user_settings ()
auto const& config_list = config.toObject ();
for (auto item = config_list.constBegin (); item != config_list.constEnd (); ++item)
{
set_conf (item.key ().toLocal8Bit ().constData ()
, (*item).toVariant ().toString ().toLocal8Bit ().constData ());
m_->set_conf (item.key ().toLocal8Bit ().constData ()
, (*item).toVariant ().toString ().toLocal8Bit ().constData ());
}
}
}