From 2987e8ba8b7463b2aa032f8f99a981488a9f306e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 20 Jun 2014 21:51:59 -0400 Subject: [PATCH] fix some confusion when redrawing editor/mixer track/strip displays after track/bus deletion The code relied on the idea that the order-key resync that occurs after deletion would change the order keys and thus cause a redisplay. But since both the editor and mixer can initiate an order-key resync, the other window's resync will actually do nothing (the order keys will already be correct). This led to the incorrect placement of material in the tracks canvas, because the first resync triggered a redisplay while the route still existed, and then the second resync didn't cause a redisplay (repositioning) but the canvas elements representing the track went away. Fixed by forcing a redisplay in both editor and mixer if a route deletion is believed to be triggering a row deletion in their underlying data models. Conflicts: gtk2_ardour/editor_routes.cc --- gtk2_ardour/editor_routes.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index c42dc67aa4..6eaaa28ade 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -535,8 +535,12 @@ EditorRoutes::redisplay () /* show or hide the TimeAxisView */ if (visible) { +<<<<<<< HEAD position += tv->show_at (position, n, &_editor->edit_controls_vbox, show_number); // SHOWTRACKS +======= + position += tv->show_at (position, n, &_editor->edit_controls_vbox); +>>>>>>> 5d6dc38... fix some confusion when redrawing editor/mixer track/strip displays after track/bus deletion } else { tv->hide (); }