summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_drag.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-12-11 14:07:24 +0000
committerCarl Hetherington <carl@carlh.net>2011-12-11 14:07:24 +0000
commit692f857b83d6f09bbea9fbcca978f85a358aad9b (patch)
treeb9ab8b1fe1b30af77811479ca53e82a2da06fab4 /gtk2_ardour/editor_drag.cc
parentb4d7120a58cb3fc2a49542acab868e0eb0790864 (diff)
Yet another bug in previous commit.
git-svn-id: svn://localhost/ardour2/branches/3.0@10974 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
-rw-r--r--gtk2_ardour/editor_drag.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 5962877ef6..ef00b011c1 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -4273,7 +4273,7 @@ NoteCreateDrag::NoteCreateDrag (Editor* e, ArdourCanvas::Item* i, MidiRegionView
, _region_view (rv)
, _drag_rect (0)
{
-
+
}
NoteCreateDrag::~NoteCreateDrag ()
@@ -4296,6 +4296,8 @@ NoteCreateDrag::grid_frames (framepos_t t) const
void
NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
{
+ Drag::start_grab (event, cursor);
+
_drag_rect = new ArdourCanvas::SimpleRect (*_region_view->get_canvas_group ());
framepos_t pf = _drags->current_pointer_frame ();
@@ -4340,7 +4342,7 @@ void
NoteCreateDrag::finished (GdkEvent* event, bool had_movement)
{
if (!had_movement) {
- abort ();
+ return;
}
framepos_t const start = min (_note[0], _note[1]);
@@ -4350,7 +4352,7 @@ NoteCreateDrag::finished (GdkEvent* event, bool had_movement)
if (_editor->snap_mode() == SnapNormal && length < g) {
length = g;
}
-
+
_region_view->create_note_at (start, _drag_rect->property_y1(), _region_view->region_frames_to_region_beats (length), true, false);
}