From 5b707b771be0cb2086600e5de2fd2206eaf47477 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 22 Oct 2016 12:07:28 +0200 Subject: [PATCH] Tx ph.1: Fixed Tx preset channels loading --- sdrbase/device/devicesinkapi.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdrbase/device/devicesinkapi.cpp b/sdrbase/device/devicesinkapi.cpp index fdaebd36e..7f4fe2878 100644 --- a/sdrbase/device/devicesinkapi.cpp +++ b/sdrbase/device/devicesinkapi.cpp @@ -273,7 +273,7 @@ void DeviceSinkAPI::loadChannelSettings(const Preset *preset, PluginAPI *pluginA qDebug("DeviceSinkAPI::loadChannelSettings: Loading preset [%s | %s]", qPrintable(preset->getGroup()), qPrintable(preset->getDescription())); // Available channel plugins - PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getRxChannelRegistrations(); + PluginAPI::ChannelRegistrations *channelRegistrations = pluginAPI->getTxChannelRegistrations(); // copy currently open channels and clear list ChannelInstanceRegistrations openChannels = m_channelInstanceRegistrations; @@ -303,7 +303,7 @@ void DeviceSinkAPI::loadChannelSettings(const Preset *preset, PluginAPI *pluginA // if we haven't one already, create one - if(reg.m_gui == NULL) + if(reg.m_gui == 0) { for(int i = 0; i < channelRegistrations->count(); i++) { @@ -316,7 +316,7 @@ void DeviceSinkAPI::loadChannelSettings(const Preset *preset, PluginAPI *pluginA } } - if(reg.m_gui != NULL) + if(reg.m_gui != 0) { qDebug("DeviceSinkAPI::loadChannelSettings: deserializing channel [%s]", qPrintable(channelConfig.m_channel)); reg.m_gui->deserialize(channelConfig.m_config);