diff options
| author | Josh Blum <josh@joshknows.com> | 2012-03-29 16:03:13 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-03-29 16:03:13 -0700 |
| commit | 86ff7466868504f4e7abcb06a89b59985812f645 (patch) | |
| tree | 9b191c8624f709de71748820d8ea35678d7ce8bd /host/lib/usrp/usrp1/usrp1_impl.cpp | |
| parent | 298d0ae5db4ede18295c6151f83a59b4f75c1599 (diff) | |
| parent | 7ac203b39c126c4bdb9b2f5494052fd9eea8f21b (diff) | |
| download | uhd-86ff7466868504f4e7abcb06a89b59985812f645.tar.gz uhd-86ff7466868504f4e7abcb06a89b59985812f645.tar.bz2 uhd-86ff7466868504f4e7abcb06a89b59985812f645.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/usrp1/usrp1_impl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.cpp b/host/lib/usrp/usrp1/usrp1_impl.cpp index 607badda9..1db2efa0d 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.cpp +++ b/host/lib/usrp/usrp1/usrp1_impl.cpp @@ -413,8 +413,7 @@ usrp1_impl::~usrp1_impl(void){ this->enable_rx(false); this->enable_tx(false); ) - _tree.reset(); //resets counts on sptrs held in tree - _soft_time_ctrl.reset(); //stops cmd task before proceeding + _soft_time_ctrl->stop(); //stops cmd task before proceeding _io_impl.reset(); //stops vandal before other stuff gets deconstructed } |