From 31f0d6b31122289ab6cddb7476ac4c1dda3d90c9 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Sun, 19 Feb 2012 23:45:15 -0800
Subject: [PATCH] Mixer: Destroy instances of Controller_Module when the
 connected modules are removed.

---
 mixer/src/Module.C | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/mixer/src/Module.C b/mixer/src/Module.C
index 0bfd802..adf35f5 100644
--- a/mixer/src/Module.C
+++ b/mixer/src/Module.C
@@ -71,7 +71,6 @@ Module::Module ( ) : Fl_Group( 0, 0, 50, 50, "Unnamed" )
 
 Module::~Module ( )
 {
-
     if ( _editor )
     {
         delete _editor;
@@ -84,7 +83,15 @@ Module::~Module ( )
         audio_output[i].disconnect();
     for ( unsigned int i = 0; i < control_input.size(); ++i )
     {
-        control_input[i].disconnect();
+        /* destroy connected Controller_Module */
+        if ( control_input[i].connected() )
+        {
+            Module *o = (Module*)control_input[i].connected_port()->module();
+
+            control_input[i].disconnect();
+            delete o;
+        }
+
         control_input[i].destroy_osc_port();
     }
     for ( unsigned int i = 0; i < control_output.size(); ++i )
@@ -95,6 +102,9 @@ Module::~Module ( )
 
     control_input.clear();
     control_output.clear();
+
+    if ( parent() )
+        parent()->remove( this );
 }