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
This commit is contained in:
Paul Davis 2014-06-20 21:51:59 -04:00
parent 207bbbb395
commit 2987e8ba8b

View file

@ -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 ();
}