Fix issue with re-loading FPGA

Source/Processors/DataThreads/RHD2000Thread.cpp

@@ -109,7 +109,10 @@ RHD2000Thread::~RHD2000Thread()
     }
 
 	if (deviceFound)
+    {
 		evalBoard->resetFpga();
+    }
+
 
     deleteAndZero(dataBlock);
 
@@ -276,7 +279,7 @@ void RHD2000Thread::initializeBoard()
     Rhd2000DataBlock* dataBlock = new Rhd2000DataBlock(evalBoard->getNumEnabledDataStreams());
 
 
-    evalBoard->readDataBlock(dataBlock);
+   // evalBoard->readDataBlock(dataBlock);
 
     // Now that ADC calibration has been performed, we switch to the command sequence
     // that does not execute ADC calibration.

Source/Processors/SpikeDetector.cpp

@@ -213,7 +213,11 @@ void SpikeDetector::setChannel(int electrodeIndex, int channelNum, int newChanne
 
 int SpikeDetector::getNumChannels(int index)
 {
-    return electrodes[index]->numChannels;
+
+    if (index < electrodes.size())
+        return electrodes[index]->numChannels;
+    else
+        return 0;
 }
 
 int SpikeDetector::getChannel(int index, int i)