Fix for crash on track removal, backported from trunk.

[ardour.git] / gtk2_ardour / editor_route_list.cc

diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index ba17495e60bc30c0bfd03d11d4058459a3a05e09..769bd5dc2588b12a9b041568c7e62e2a730eb922 100644 (file)
--- 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);