diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-13 11:54:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-07-13 11:54:05 -0700 |
| commit | 851d7a27f09c27f84ba7f9ad19c3ba835c61af7f (patch) | |
| tree | 67666bbb1914d8ce21f62868947e3f702d744528 /gr-uhd | |
| parent | cbf30e9cf8804a0c6c225a821ffa3e935bae299c (diff) | |
| parent | 29b4aa43a5296acf1c8de691f838ecee2597fb32 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/python/grc_gnuradio/blks2/packet.py
gr-uhd/lib/usrp_sink_impl.cc
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/lib/usrp_sink_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-uhd/lib/usrp_sink_impl.cc b/gr-uhd/lib/usrp_sink_impl.cc index 4e2e9467dd..ef49c1048e 100644 --- a/gr-uhd/lib/usrp_sink_impl.cc +++ b/gr-uhd/lib/usrp_sink_impl.cc @@ -535,7 +535,8 @@ namespace gr { bool usrp_sink_impl::start(void) { - _tx_stream = _dev->get_tx_stream(_stream_args); + if (not _tx_stream) + _tx_stream = _dev->get_tx_stream(_stream_args); _metadata.start_of_burst = true; _metadata.end_of_burst = false; |