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: db5bbeee568c
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8f5a8e4eaf8f
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 18, 2021

  1. FlowGraphNode: free dangling refs during shutdown in base class, not …

    …just in Filter class. Prevents triggers from holding onto refs to their inputs.
    azonenberg committed Mar 18, 2021
    Copy the full SHA
    8f5a8e4 View commit details
Showing with 6 additions and 6 deletions.
  1. +0 −6 scopehal/Filter.cpp
  2. +6 −0 scopehal/FlowGraphNode.cpp
6 changes: 0 additions & 6 deletions scopehal/Filter.cpp
Original file line number Diff line number Diff line change
@@ -126,12 +126,6 @@ Filter::~Filter()
#endif

m_filters.erase(this);

for(auto c : m_inputs)
{
if(c.m_channel != NULL)
c.m_channel->Release();
}
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
6 changes: 6 additions & 0 deletions scopehal/FlowGraphNode.cpp
Original file line number Diff line number Diff line change
@@ -51,6 +51,12 @@ FlowGraphNode::FlowGraphNode()

FlowGraphNode::~FlowGraphNode()
{
//Release any inputs we currently have refs to
for(auto c : m_inputs)
{
if(c.m_channel != NULL)
c.m_channel->Release();
}
}

////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////