Skip to content

Commit d8cfb03

Browse files
committed
Fix channel duplication bug inside record node
1 parent c85b233 commit d8cfb03

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

Source/Processors/GenericProcessor/GenericProcessor.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -333,19 +333,20 @@ void GenericProcessor::update()
333333
dataChannelArray.add (ch);
334334
}
335335

336-
for (int i = 0; i < sourceNode->eventChannelArray.size(); ++i)
337-
{
338-
EventChannel* sourceChan = sourceNode->eventChannelArray[i];
339-
EventChannel* ch = new EventChannel (*sourceChan);
336+
for (int i = 0; i < sourceNode->eventChannelArray.size(); ++i)
337+
{
338+
EventChannel* sourceChan = sourceNode->eventChannelArray[i];
339+
EventChannel* ch = new EventChannel(*sourceChan);
340340
ch->eventMetaDataLock = true;
341-
eventChannelArray.add (ch);
342-
}
341+
eventChannelArray.add(ch);
342+
}
343343
for (int i = 0; i < sourceNode->spikeChannelArray.size(); ++i)
344344
{
345345
SpikeChannel* sourceChan = sourceNode->spikeChannelArray[i];
346346
SpikeChannel* ch = new SpikeChannel(*sourceChan);
347347
ch->eventMetaDataLock = true;
348348
spikeChannelArray.add(ch);
349+
349350
}
350351
for (int i = 0; i < sourceNode->configurationObjectArray.size(); ++i)
351352
{

Source/Processors/RecordNode/RecordNode.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,10 @@ void RecordNode::addInputChannel(const GenericProcessor* sourceNode, int chan)
159159

160160
for (int n = 0; n < sourceNode->getTotalEventChannels(); n++)
161161
{
162-
163-
eventChannelArray.add(new EventChannel(*sourceNode->getEventChannel(n)));
162+
const EventChannel* orig = sourceNode->getEventChannel(n);
163+
//only add to the record node the events originating from this processor, to avoid duplicates
164+
if (orig->getSourceNodeID() == sourceNode->getNodeId())
165+
eventChannelArray.add(new EventChannel(*orig));
164166

165167
}
166168

0 commit comments

Comments
 (0)