diff --git a/.gitignore b/.gitignore index 8961ce21f..77a85d140 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,20 @@ Builds/VisualStudio2012/open-ephys.vcxproj.user Builds/VisualStudio2012/windowState.xml Builds/VisualStudio2012/pipetest.bit +Builds/VisualStudio2013/Debug +Builds/VisualStudio2013/Release +Builds/VisualStudio2013/Debug64 +Builds/VisualStudio2013/Release64 +Builds/VisualStudio2013/x64 +Builds/VisualStudio2013/ipch +Builds/VisualStudio2013/open-ephys.sdf +Builds/VisualStudio2013/open-ephys.opensdf +Builds/VisualStudio2013/open-ephys.suo +Builds/VisualStudio2013/open-ephys.v12.suo +Builds/VisualStudio2013/open-ephys.vcxproj.user +Builds/VisualStudio2013/windowState.xml +Builds/VisualStudio2013/pipetest.bit + Builds/VisualStudio2010/Debug Builds/VisualStudio2010/Release Builds/VisualStudio2010/ipch diff --git a/Source/Processors/AudioResamplingNode/AudioResamplingNode.cpp b/Source/Processors/AudioResamplingNode/AudioResamplingNode.cpp index db313b5ba..3fb680a52 100644 --- a/Source/Processors/AudioResamplingNode/AudioResamplingNode.cpp +++ b/Source/Processors/AudioResamplingNode/AudioResamplingNode.cpp @@ -58,10 +58,10 @@ AudioResamplingNode::AudioResamplingNode() AudioResamplingNode::~AudioResamplingNode() { - filter = 0; - deleteAndZero(destBuffer); + delete[] continuousDataBuffer; deleteAndZero(tempBuffer); - + deleteAndZero(destBuffer); + delete filter; } diff --git a/Source/Processors/RecordNode/RecordNode.cpp b/Source/Processors/RecordNode/RecordNode.cpp index 6d1549a2d..e1d8e780d 100755 --- a/Source/Processors/RecordNode/RecordNode.cpp +++ b/Source/Processors/RecordNode/RecordNode.cpp @@ -65,7 +65,7 @@ RecordNode::RecordNode() RecordNode::~RecordNode() { - + delete eventChannel; // Memory leak fixed by Michael Borisov } void RecordNode::setChannel(Channel* ch) diff --git a/Source/UI/EditorViewport.cpp b/Source/UI/EditorViewport.cpp index a3c3dfd8b..36144cc80 100755 --- a/Source/UI/EditorViewport.cpp +++ b/Source/UI/EditorViewport.cpp @@ -80,6 +80,7 @@ EditorViewport::EditorViewport() EditorViewport::~EditorViewport() { deleteAllChildren(); + delete signalChainManager; } void EditorViewport::signalChainCanBeEdited(bool t)