3 files changed, 37 insertions, 1 deletions
diff --git a/gnuradio-runtime/include/gnuradio/sptr_magic.h b/gnuradio-runtime/include/gnuradio/sptr_magic.h
index 898edc87fd..6deb3062ae 100644
--- a/gnuradio-runtime/include/gnuradio/sptr_magic.h
+++ b/gnuradio-runtime/include/gnuradio/sptr_magic.h
@@ -38,6 +38,7 @@ namespace gnuradio {
     public:
       static boost::shared_ptr<gr::basic_block> fetch_initial_sptr(gr::basic_block *p);
       static void create_and_stash_initial_sptr(gr::hier_block2 *p);
+      static void cancel_initial_sptr(gr::hier_block2 *p);
     };
   };
 
diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc
index eeb5669da5..597ae032ec 100644
--- a/gnuradio-runtime/lib/hier_block2.cc
+++ b/gnuradio-runtime/lib/hier_block2.cc
@@ -57,6 +57,8 @@ namespace gr {
 
   hier_block2::~hier_block2()
   {
+    disconnect_all();
+    gnuradio::detail::sptr_magic::cancel_initial_sptr(this);
     delete d_detail;
   }
 
diff --git a/gnuradio-runtime/lib/sptr_magic.cc b/gnuradio-runtime/lib/sptr_magic.cc
index 70596abb05..e5e83722fc 100644
--- a/gnuradio-runtime/lib/sptr_magic.cc
+++ b/gnuradio-runtime/lib/sptr_magic.cc
@@ -36,14 +36,47 @@ namespace gnuradio {
   typedef std::map<gr::basic_block*, gr::basic_block_sptr> sptr_map;
   static sptr_map s_map;
 
+  struct disarmable_deleter
+  {
+    bool armed;
+
+    disarmable_deleter()
+    {
+      armed = true;
+    }
+
+    void operator()(void *p) const
+    {
+      if (armed)
+        delete static_cast<gr::basic_block *>(p);
+    }
+
+    void disarm()
+    {
+      armed = false;
+    }
+  };
+
   void
   detail::sptr_magic::create_and_stash_initial_sptr(gr::hier_block2 *p)
   {
-    gr::basic_block_sptr sptr(p);
+    gr::basic_block_sptr sptr(p, disarmable_deleter());
     gr::thread::scoped_lock guard(s_mutex);
     s_map.insert(sptr_map::value_type(static_cast<gr::basic_block *>(p), sptr));
   }
 
+  void
+  detail::sptr_magic::cancel_initial_sptr(gr::hier_block2 *p)
+  {
+    gr::thread::scoped_lock guard(s_mutex);
+    sptr_map::iterator pos = s_map.find(static_cast<gr::basic_block *>(p));
+    if(pos == s_map.end())
+      return; /* Not in the map, nothing to do */
+    gr::basic_block_sptr sptr = pos->second;
+    s_map.erase(pos);
+    boost::get_deleter<disarmable_deleter, gr::basic_block>(sptr)->disarm();
+  }
+
   gr::basic_block_sptr
   detail::sptr_magic::fetch_initial_sptr(gr::basic_block *p)
   {