From f8d6ceb2003251b4ab69f04c87de0d18dece4a9a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Sat, 17 Nov 2007 20:35:32 +0000
Subject: [PATCH] Fix for crash on track removal, backported from trunk.

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2687 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/editor_route_list.cc | 8 ++++++++
 gtk2_ardour/mixer_ui.cc          | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index ba17495e60..769bd5dc25 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -115,6 +115,14 @@ Editor::remove_route (TimeAxisView *tv)
 	TreeModel::Children rows = route_display_model->children();
 	TreeModel::Children::iterator ri;
 
+	/* Decrement old order keys for tracks `above' the one that is being removed */
+	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+		TimeAxisView* v = (*ri)[route_display_columns.tv];
+		if (v->old_order_key() > tv->old_order_key()) {
+			v->set_old_order_key (v->old_order_key() - 1);
+		}
+	}
+
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
 		if ((*ri)[route_display_columns.tv] == tv) {
 			route_display_model->erase (ri);
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 7f7717e00f..6949d31bd3 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -327,6 +327,14 @@ Mixer_UI::remove_strip (MixerStrip* strip)
 		strips.erase (i);
 	}
 
+	/* Decrement old order keys for strips `above' the one that is being removed */
+	for (ri = rows.begin(); ri != rows.end(); ++ri) {
+		MixerStrip* s = (*ri)[track_columns.strip];
+		if (s->old_order_key() > strip->old_order_key()) {
+			s->set_old_order_key (s->old_order_key() - 1);
+		}
+	}
+
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
 		if ((*ri)[track_columns.strip] == strip) {
 			track_model->erase (ri);