smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2559; crash when doing end_grab on an already-deleted canvas item.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4709 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-02-28 01:52:45 +00:00
parent 737ce09ef0
commit edee84d014
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor.cc
View file

@ -911,6 +911,10 @@ Editor::catch_vanishing_regionview (RegionView *rv)
audioregionview by itself. audioregionview by itself.
*/ */
if (rv->get_canvas_group() == drag_info.item) {
end_grab (drag_info.item, 0);
}
if (clicked_regionview == rv) { if (clicked_regionview == rv) {
clicked_regionview = 0; clicked_regionview = 0;
} }

7
gtk2_ardour/editor_mouse.cc
View file

@ -2053,6 +2053,9 @@ Editor::swap_grab (ArdourCanvas::Item* new_item, Gdk::Cursor* cursor, uint32_t t
drag_info.item->grab (Gdk::POINTER_MOTION_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK, *cursor, time); drag_info.item->grab (Gdk::POINTER_MOTION_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK, *cursor, time);
} }
/** @param item Canvas item
* @param event GDK event, or 0.
*/
bool bool
Editor::end_grab (ArdourCanvas::Item* item, GdkEvent* event) Editor::end_grab (ArdourCanvas::Item* item, GdkEvent* event)
{ {
@ -2064,9 +2067,9 @@ Editor::end_grab (ArdourCanvas::Item* item, GdkEvent* event)
return false; return false;
} }
drag_info.item->ungrab (event->button.time); drag_info.item->ungrab (event ? event->button.time : 0);
if (drag_info.finished_callback) { if (drag_info.finished_callback && event) {
drag_info.last_pointer_x = drag_info.current_pointer_x; drag_info.last_pointer_x = drag_info.current_pointer_x;
drag_info.last_pointer_y = drag_info.current_pointer_y; drag_info.last_pointer_y = drag_info.current_pointer_y;
(this->*(drag_info.finished_callback)) (item, event); (this->*(drag_info.finished_callback)) (item, event);

1
gtk2_ardour/streamview.h
View file

@ -46,7 +46,6 @@ struct RecBoxInfo {
nframes_t length; nframes_t length;
}; };
class PublicEditor;
class Selectable; class Selectable;
class RouteTimeAxisView; class RouteTimeAxisView;
class RegionView; class RegionView;