summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-04-07 23:14:04 +0000
committerCarl Hetherington <carl@carlh.net>2011-04-07 23:14:04 +0000
commit33cd347529f5b745bc15658e05a0be187f40e988 (patch)
tree8aa523faa4186c70e610d0ddba14e8cda4f61b1a /gtk2_ardour
parent75bea7441266f410dd1f177bb056dea874ddebcc (diff)
Fix crash due to _over_region_trim_target not being updated when a RegionView disappears (#3956).
git-svn-id: svn://localhost/ardour2/branches/3.0@9332 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/editor.cc2
-rw-r--r--gtk2_ardour/editor_mouse.cc2
2 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 050f9b6a1e..806058b610 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -802,6 +802,8 @@ Editor::catch_vanishing_regionview (RegionView *rv)
if (!_all_region_actions_sensitized) {
sensitize_all_region_actions (true);
}
+
+ _over_region_trim_target = false;
}
void
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 9c1b764985..96815f2568 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -2754,6 +2754,8 @@ Editor::remove_midi_note (ArdourCanvas::Item* item, GdkEvent *)
void
Editor::set_canvas_cursor_for_region_view (double x, RegionView* rv)
{
+ assert (rv);
+
ArdourCanvas::Group* g = rv->get_canvas_group ();
ArdourCanvas::Group* p = g->get_parent_group ();