summaryrefslogtreecommitdiff
path: root/gtk2_ardour/step_editor.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-06-06 09:52:21 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-06-06 09:52:21 -0400
commitce8731b32d5e91f56396cb5f6ca0798bc7fed48a (patch)
tree0906e655441185e51677d41e76a5d075f59a94af /gtk2_ardour/step_editor.cc
parentbebe2af95ad9999fdca719450dc2c70cfb849076 (diff)
parent8bfaa2d3d9e7712a238651c487c761e70b20f6ab (diff)
Merge branch 'master' into cairocanvas
Diffstat (limited to 'gtk2_ardour/step_editor.cc')
-rw-r--r--gtk2_ardour/step_editor.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index 0774252a44..c6c34d6c17 100644
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -255,7 +255,9 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
assert (step_edit_region);
assert (step_edit_region_view);
- if (beat_duration == 0.0) {
+ if (beat_duration == 0.0 && step_editor) {
+ beat_duration = step_editor->note_length();
+ } else if (beat_duration == 0.0) {
bool success;
beat_duration = _editor.get_grid_type_as_beats (success, step_edit_insert_position);