diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-10 07:13:43 -0800 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-02-10 07:13:43 -0800 |
commit | 7f07703cf764135cf441d67cec288cf53afa0c9c (patch) | |
tree | 67d41a77d264126b9097a7d5cea2708690a260e8 /gnuradio-runtime/lib/flat_flowgraph.cc | |
parent | 6113d99e32d810ae311f41fa2da5a6279ed70006 (diff) | |
parent | cf95377ae162c6145e954d7c29c9814e6465f9fc (diff) |
Merge remote-tracking branch 'tom/issue713'
Diffstat (limited to 'gnuradio-runtime/lib/flat_flowgraph.cc')
-rw-r--r-- | gnuradio-runtime/lib/flat_flowgraph.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnuradio-runtime/lib/flat_flowgraph.cc b/gnuradio-runtime/lib/flat_flowgraph.cc index 81c1184cfa..653cfcc3d6 100644 --- a/gnuradio-runtime/lib/flat_flowgraph.cc +++ b/gnuradio-runtime/lib/flat_flowgraph.cc @@ -225,9 +225,10 @@ namespace gr { std::cout << "merge: allocating new detail for block " << (*p) << std::endl; block->set_detail(allocate_block_detail(block)); } - else + else { if(FLAT_FLOWGRAPH_DEBUG) std::cout << "merge: reusing original detail for block " << (*p) << std::endl; + } } // Calculate the old edges that will be going away, and clear the @@ -311,6 +312,9 @@ namespace gr { // Now deal with the fact that the block details might have // changed numbers of inputs and outputs vs. in the old // flowgraph. + + block->detail()->reset_nitem_counters(); + block->detail()->clear_tags(); } } |