properly teardown entire window for control protocol GUI

git-svn-id: svn://localhost/ardour2/branches/3.0@12259 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index d22ef625f227186cb087515e7c26e100f8224e68..ac9c11a5bb6f08fcdd9811b0003999d03ab77e3e 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -722,7 +722,17 @@ private:
                        if (!was_enabled) {
                                ControlProtocolManager::instance().instantiate (*cpi);
                        } else {
+                               Gtk::Window* win = r[_model.editor];
+                               if (win) {
+                                       win->hide ();
+                               }
+
                                ControlProtocolManager::instance().teardown (*cpi);
+                                       
+                               if (win) {
+                                       delete win;
+                               }
+                               r[_model.editor] = 0;
                                cpi->requested = false;
                        }
                }