From 5f1adb2338f85d82d874fa963d587b00431d01a7 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 2 Jan 2020 20:10:01 +0100 Subject: [PATCH] REST API: fixed is not xxx capable device set bug --- sdrgui/webapi/webapiadaptergui.cpp | 4 ++-- sdrsrv/webapi/webapiadaptersrv.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdrgui/webapi/webapiadaptergui.cpp b/sdrgui/webapi/webapiadaptergui.cpp index c721e1511..984e712e9 100644 --- a/sdrgui/webapi/webapiadaptergui.cpp +++ b/sdrgui/webapi/webapiadaptergui.cpp @@ -1707,7 +1707,7 @@ int WebAPIAdapterGUI::devicesetChannelPost( if (query.getDirection() == 0) // Single Rx { - if (!deviceSet->m_deviceSourceEngine || !deviceSet->m_deviceMIMOEngine) + if (!deviceSet->m_deviceSourceEngine && !deviceSet->m_deviceMIMOEngine) { error.init(); *error.getMessage() = QString("Device set at %1 is not a receive capable device set").arg(deviceSetIndex); @@ -1743,7 +1743,7 @@ int WebAPIAdapterGUI::devicesetChannelPost( } else if (query.getDirection() == 1) // single Tx { - if (!deviceSet->m_deviceSinkEngine || !deviceSet->m_deviceMIMOEngine) + if (!deviceSet->m_deviceSinkEngine && !deviceSet->m_deviceMIMOEngine) { error.init(); *error.getMessage() = QString("Device set at %1 is not a transmit capable device set").arg(deviceSetIndex); diff --git a/sdrsrv/webapi/webapiadaptersrv.cpp b/sdrsrv/webapi/webapiadaptersrv.cpp index 97f8a5434..d010d72d6 100644 --- a/sdrsrv/webapi/webapiadaptersrv.cpp +++ b/sdrsrv/webapi/webapiadaptersrv.cpp @@ -1805,7 +1805,7 @@ int WebAPIAdapterSrv::devicesetChannelPost( if (query.getDirection() == 0) // Single Rx { - if (!deviceSet->m_deviceSourceEngine || !deviceSet->m_deviceMIMOEngine) + if (!deviceSet->m_deviceSourceEngine && !deviceSet->m_deviceMIMOEngine) { error.init(); *error.getMessage() = QString("Device set at %1 is not a receive capable device set").arg(deviceSetIndex); @@ -1841,7 +1841,7 @@ int WebAPIAdapterSrv::devicesetChannelPost( } else if (query.getDirection() == 1) // single Tx { - if (!deviceSet->m_deviceSinkEngine || !deviceSet->m_deviceMIMOEngine) + if (!deviceSet->m_deviceSinkEngine && !deviceSet->m_deviceMIMOEngine) { error.init(); *error.getMessage() = QString("Device set at %1 is not a transmit capable device set").arg(deviceSetIndex);