ngscopeclient · May 11, 2020 · May 11, 2020
Showing with 13 additions and 1 deletion.

+2 −0 scopeprotocols/ClockRecoveryDebugDecoder.cpp

+10 −1 scopeprotocols/ClockRecoveryDecoder.cpp

+1 −0 scopeprotocols/ClockRecoveryDecoder.h
diff --git a/scopeprotocols/ClockRecoveryDebugDecoder.cpp b/scopeprotocols/ClockRecoveryDebugDecoder.cpp
@@ -41,6 +41,8 @@ ClockRecoveryDebugDecoder::ClockRecoveryDebugDecoder(string color)
 	//Set up channels
 	m_signalNames.push_back("PLL");
 	m_channels.push_back(NULL);
+
+	m_yAxisUnit = Unit(Unit::UNIT_PS);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/scopeprotocols/ClockRecoveryDecoder.cpp b/scopeprotocols/ClockRecoveryDecoder.cpp
@@ -57,6 +57,15 @@ ClockRecoveryDecoder::ClockRecoveryDecoder(string color)
 	m_nominalPeriod = 0;
 }
 
+ClockRecoveryDecoder::~ClockRecoveryDecoder()
+{
+	if(m_phaseErrorCapture)
+	{
+		delete m_phaseErrorCapture;
+		m_phaseErrorCapture = NULL;
+	}
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Factory methods
 
@@ -146,7 +155,7 @@ void ClockRecoveryDecoder::Refresh()
 
 	//Create debug capture
 	if(m_phaseErrorCapture != NULL)
-		m_phaseErrorCapture = NULL;
+		delete m_phaseErrorCapture;
 	m_phaseErrorCapture = new AnalogCapture;
 	m_phaseErrorCapture->m_startTimestamp = din->m_startTimestamp;
 	m_phaseErrorCapture->m_startPicoseconds = din->m_startPicoseconds;

diff --git a/scopeprotocols/ClockRecoveryDecoder.h b/scopeprotocols/ClockRecoveryDecoder.h
@@ -41,6 +41,7 @@ class ClockRecoveryDecoder : public ProtocolDecoder
 {
 public:
 	ClockRecoveryDecoder(std::string color);
+	virtual ~ClockRecoveryDecoder();
 
 	virtual void Refresh();