Merge branch 'master' of https://github.com/open-ephys/GUI

Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp

@@ -52,7 +52,7 @@ Rhd2000EvalBoard::Rhd2000EvalBoard()
 //Destructor: Deletes the device to avoid memory leak
 Rhd2000EvalBoard::~Rhd2000EvalBoard()
 {
-	delete dev;
+	if (dev != 0) delete dev;
 }
 
 // Find an Opal Kelly XEM6010-LX45 board attached to a USB port and open it.

Source/Processors/FilterNode.cpp

@@ -138,7 +138,7 @@ void FilterNode::updateSettings()
 
             filters.add(new Dsp::SmoothedFilterDesign
                         <Dsp::Butterworth::Design::BandPass 	// design type
-                        <2>,								 	// order
+                        <3>,								 	// order
                         1,										// number of channels (must be const)
                         Dsp::DirectFormII>						// realization
                         (1));