diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-20 21:51:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-20 21:52:24 -0400 |
| commit | 5d6dc388f71dbb4910832ed766af92592b000e52 (patch) | |
| tree | 195bf151357f35378a00197390e92383927b3343 /gtk2_ardour/editor_routes.h | |
| parent | 237741d18722252abd4a6a20d3422315481ccffe (diff) | |
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.
Diffstat (limited to 'gtk2_ardour/editor_routes.h')
| -rw-r--r-- | gtk2_ardour/editor_routes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h index 9780307435..dea8da6cc0 100644 --- a/gtk2_ardour/editor_routes.h +++ b/gtk2_ardour/editor_routes.h @@ -73,7 +73,7 @@ private: void build_menu (); void show_menu (); void sync_treeview_from_order_keys (); - void route_deleted (Gtk::TreeModel::Path const &); + void row_deleted (Gtk::TreeModel::Path const &); void visible_changed (std::string const &); void active_changed (std::string const &); void reordered (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int *); @@ -156,6 +156,7 @@ private: bool _ignore_reorder; bool _no_redisplay; bool _adding_routes; + bool _route_deletion_in_progress; Gtk::Menu* _menu; Gtk::Widget* old_focus; |