b100: order of deconstruction, kill marauder first

1 files changed, 5 insertions, 0 deletions

diff --git a/host/lib/usrp/b100/b100_ctrl.cpp b/host/lib/usrp/b100/b100_ctrl.cpp
index e08b47ce4..7d40daa32 100644
--- a/host/lib/usrp/b100/b100_ctrl.cpp
+++ b/host/lib/usrp/b100/b100_ctrl.cpp
@@ -45,6 +45,11 @@ public:
         viking_marauder = task::make(boost::bind(&b100_ctrl_impl::viking_marauder_loop, this));
     }
 
+    ~b100_ctrl_impl(void){
+        //stop the marauder first so it cant access deconstructed objects
+        viking_marauder.reset();
+    }
+
     int write(boost::uint32_t addr, const ctrl_data_t &data);
     ctrl_data_t read(boost::uint32_t addr, size_t len);