diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 14:20:47 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 14:40:43 -0700 |
| commit | 6d2221196082a4954c249dc6955e33d5832a56f2 (patch) | |
| tree | 395b17bedf5b63701f7717c4ac625870890de9df /gnuradio-runtime/lib/hier_block2_detail.cc | |
| parent | 26b3cd78b30f5c1163060f45a3d9e6175395e962 (diff) | |
| parent | aa2308eba953289d2058d01cee927ed26cdf1c09 (diff) | |
Merge remote-tracking branch 'github/pr/1476' into maint
Diffstat (limited to 'gnuradio-runtime/lib/hier_block2_detail.cc')
| -rw-r--r-- | gnuradio-runtime/lib/hier_block2_detail.cc | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc index 49eb34a6d1..82a40fe211 100644 --- a/gnuradio-runtime/lib/hier_block2_detail.cc +++ b/gnuradio-runtime/lib/hier_block2_detail.cc @@ -787,13 +787,6 @@ namespace gr { std::vector<basic_block_sptr>::const_iterator b; // Because flatten_aux is const for(b = d_blocks.begin(); b != d_blocks.end(); b++) { tmp.push_back(*b); - // for every block, attempt to setup RPC - if(ctrlport_on) { - if(!(*b)->is_rpc_set()) { - (*b)->setup_rpc(); - (*b)->rpc_set(); - } - } } // Now add the list of connected input blocks @@ -901,6 +894,16 @@ namespace gr { std::cout << "flatten_aux finished in top_block" << std::endl; sfg->dump(); } + + // if ctrlport is enabled, call setup RPC for all blocks in the flowgraph + if(ctrlport_on) { + for(b = blocks.begin(); b != blocks.end(); b++) { + if(!(*b)->is_rpc_set()) { + (*b)->setup_rpc(); + (*b)->rpc_set(); + } + } + } } void |