diff options
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/tape_region_view.cc | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 56eed50e4f..300cfe3cf7 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1151,6 +1151,10 @@ Editor::update_punch_range_view (bool visibility) void Editor::marker_selection_changed () { + if (session && session->deletion_in_progress()) { + return; + } + for (LocationMarkerMap::iterator i = location_markers.begin(); i != location_markers.end(); ++i) { LocationMarkers* lam = i->second; diff --git a/gtk2_ardour/tape_region_view.cc b/gtk2_ardour/tape_region_view.cc index 9022e35896..c198d86066 100644 --- a/gtk2_ardour/tape_region_view.cc +++ b/gtk2_ardour/tape_region_view.cc @@ -62,7 +62,11 @@ TapeAudioRegionView::TapeAudioRegionView (ArdourCanvas::Group *parent, RouteTime void TapeAudioRegionView::init (Gdk::Color& basic_color, bool wfw) { - AudioRegionView::init(basic_color, wfw); + /* never wait for data: always just create the waves, connect once and then + we'll update whenever we need to. + */ + + AudioRegionView::init(basic_color, false); /* every time the wave data changes and peaks are ready, redraw */ |