w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-02 05:54:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.2.0' into develop

Browse Source
This commit is contained in:
Bill Somerville
2020-06-02 01:52:48 +01:00
parent 0c7fe62c2a e9ad745422
commit 90a89c5a98
8 changed files with 102 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Transceiver/HamlibTransceiver.cpp
+4 -2
View File
@@ -376,9 +376,11 @@ HamlibTransceiver::HamlibTransceiver (int model_number, TransceiverFactory::Para
case TransceiverFactory::PTT_method_DTR:
case TransceiverFactory::PTT_method_RTS:
if (!params.ptt_port.isEmpty ()
if (params.ptt_port.size ()
&& params.ptt_port != "None"
&& (is_dummy_ || params.ptt_port != params.serial_port))
&& (is_dummy_
|| RIG_PORT_SERIAL != rig_->caps->port_type
|| params.ptt_port != params.serial_port))
{
#if defined (WIN32)
set_conf ("ptt_pathname", ("\\\\.\\" + params.ptt_port).toLatin1 ().data ());