remove/delete current mixer strip when session is deleted

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4867 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 4 deletions

diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc
index bc3d9cf9ca..de0a27c687 100644
--- a/gtk2_ardour/editor_mixer.cc
+++ b/gtk2_ardour/editor_mixer.cc
@@ -396,11 +396,15 @@ Editor::session_going_away ()
 		current_bbt_points = 0;
 	}
 
-	/* mixer strip will be deleted all by itself 
-	   when its route is deleted.
-	*/
+	/* get rid of any existing editor mixer strip */
 
-	current_mixer_strip = 0;
+	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");