Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d4f9f09fb182
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b217afab06b
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 22, 2020

  1. ProtocolDecoder: fixed refcounting of channels

    @azonenberg
    azonenberg committed Mar 22, 2020
    Copy the full SHA
    9b217af View commit details
Showing with 4 additions and 5 deletions.
  1. +4 −5 scopehal/ProtocolDecoder.cpp
9 changes: 4 additions & 5 deletions scopehal/ProtocolDecoder.cpp
View file
Original file line number Diff line number Diff line change
@@ -199,11 +199,6 @@ ProtocolDecoder::~ProtocolDecoder()
void ProtocolDecoder::AddRef()
{
m_refcount ++;
for(auto c : m_channels)
{
if(c != NULL)
c->AddRef();
}
}

void ProtocolDecoder::Release()
@@ -255,7 +250,11 @@ void ProtocolDecoder::SetInput(size_t i, OscilloscopeChannel* channel)
{
LogError("Invalid channel format\n");
}

if(m_channels[i] != NULL)
m_channels[i]->Release();
m_channels[i] = channel;
channel->AddRef();
}
else
{