From fc22351e02fdd845b898ebe99dd9ed05a87dbe11 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Wed, 18 Feb 2015 22:29:47 +0000 Subject: [PATCH] Make check for non-working split query more general Some Hamlib back ends clain to support split queries but they don't work. The existing code to only try a split query once per session if it fails has been extended to any error from Hamlib returned from a split query. Merged from wsjtx-1.4 branch. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4972 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- HamlibTransceiver.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/HamlibTransceiver.cpp b/HamlibTransceiver.cpp index 165ec4575..eebcdda4e 100644 --- a/HamlibTransceiver.cpp +++ b/HamlibTransceiver.cpp @@ -772,8 +772,11 @@ void HamlibTransceiver::poll () update_split (false); } - else if (-RIG_ENAVAIL == rc || -RIG_ENIMPL == rc) // Some rigs (Icom) don't have a way of reporting SPLIT mode + else { + // Some rigs (Icom) don't have a way of reporting SPLIT + // mode + #if WSJT_TRACE_CAT && WSJT_TRACE_CAT_POLLS qDebug () << "HamlibTransceiver::poll rig_get_split_vfo can't do on this rig"; #endif @@ -781,10 +784,6 @@ void HamlibTransceiver::poll () // just report how we see it based on prior commands split_query_works_ = false; } - else - { - error_check (rc, tr ("getting split TX VFO")); - } } if (RIG_PTT_NONE != rig_->state.pttport.type.ptt && rig_->caps->get_ptt)