From c666cd922fccae9b1a1ead4b92b624f15db36e19 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Sun, 20 Jul 2014 22:25:23 +0300
Subject: [PATCH] [Summary] Fixing the following bugs: - INSPECTOR's Mixer
 Strip should be "NO SELF DESTRUCT" - When a RouteUI object is
 non-self-destruct, it should "reset ()" instead of "delete this";

---
 gtk2_ardour/route_ui.cc         | 7 ++++---
 gtk2_ardour/ui/editor_mixer.xml | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index c0ab51982f..d046b0e496 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -185,9 +185,10 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 		set_color (unique_random_color());
 	}
 
-	if (self_destruct) {
-		rp->DropReferences.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::self_delete, this), gui_context());
-	}
+	rp->DropReferences.connect (route_connections, 
+								invalidator (*this),
+								boost::bind (self_destruct ? &RouteUI::self_delete : &RouteUI::reset,
+											 this), gui_context());
 
 	mute_button.set_controllable (_route->mute_control());
 	solo_button.set_controllable (_route->solo_control());
diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index c0f344056b..41fa83dbf0 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<RouteUI bgnormal="#383838">
+<RouteUI bgnormal="#383838" selfdestruct="false">
   <VBox>
     <VBox>
       <HBox>