From eea186d6b912f91ac32d68dde4bdb772941c0779 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sat, 12 May 2012 14:25:45 +0000
Subject: properly teardown entire window for control protocol GUI

git-svn-id: svn://localhost/ardour2/branches/3.0@12259 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/rc_option_editor.cc | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'gtk2_ardour/rc_option_editor.cc')

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index d22ef625f2..ac9c11a5bb 100644
--- 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;
 			}
 		}
-- 
cgit v1.2.3