first half of the mega-by-hand-commit-by-commit merge from 2.X

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

1 files changed, 10 insertions, 6 deletions

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index add7213400..2f858f99a0 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -408,12 +408,16 @@ Editor::session_going_away ()
 
 	delete current_bbt_points;
 	current_bbt_points = 0;
-
-	/* mixer strip will be deleted all by itself 
-	   when its route is deleted.
-	*/
-
-	current_mixer_strip = 0;
+	
+	/* get rid of any existing editor mixer strip */
+	
+	if (current_mixer_strip) {
+		if (current_mixer_strip->get_parent() != 0) {
+			global_hpacker.remove (*current_mixer_strip);
+		}
+		delete current_mixer_strip;
+		current_mixer_strip = 0;
+	}
 
 	WindowTitle title(Glib::get_application_name());
 	title += _("Editor");