Merge branch 'testing' of github.com:open-ephys/plugin-GUI into testing

Author: aacuevas

Source/Processors/RecordNode/EventQueue.h

@@ -77,14 +77,14 @@ class EventQueue
 	void reset()
 	{
 		m_data.clear();
+		m_fifo.reset();
 		m_data.resize(m_fifo.getTotalSize());
 	}
 
 	void resize(int size)
 	{
-		m_data.clear();
 		m_fifo.setTotalSize(size);
-		m_data.resize(size);
+		reset();
 	}
 
 	void addEvent(const EventClass& ev, int64 t, int extra = 0)

Source/Processors/RecordNode/RecordNode.cpp

@@ -476,7 +476,7 @@ void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& e
 					eventIndex = getEventChannelIndex(Event::getSourceIndex(event), Event::getSourceID(event), Event::getSubProcessorIdx(event));
 				else
 					eventIndex = -1;
-				if (isRecording)
+				if (isRecording && shouldRecord)
 					m_eventQueue->addEvent(event, timestamp, eventIndex);
             }
     }
@@ -565,7 +565,7 @@ int RecordNode::addSpikeElectrode(const SpikeChannel* elec)
 
 void RecordNode::writeSpike(const SpikeEvent* spike, const SpikeChannel* spikeElectrode)
 {
-	if (isRecording)
+	if (isRecording && shouldRecord)
 	{
 		int electrodeIndex = getSpikeChannelIndex(spikeElectrode->getSourceIndex(), spikeElectrode->getSourceNodeID(), spikeElectrode->getSubProcessorIdx());
 		if (electrodeIndex >= 0)