summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit/scoreedit.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-12-26 19:43:16 +0000
committerFlorian Jung <flo@windfisch.org>2011-12-26 19:43:16 +0000
commit4d8477ab60093fc4c1f6190a931d0c2fdc65384c (patch)
treea885d69728e1b5a00866e370ded173f33057e2e2 /muse2/muse/midiedit/scoreedit.cpp
parentef3de045fb88680a549435fa9099908643ee311f (diff)
parentb988a0a27bc175ce10bc8fa53ed131486813f3e7 (diff)
merged with latest release
fake-merged because of the cherry-pick
Diffstat (limited to 'muse2/muse/midiedit/scoreedit.cpp')
-rw-r--r--muse2/muse/midiedit/scoreedit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/muse2/muse/midiedit/scoreedit.cpp b/muse2/muse/midiedit/scoreedit.cpp
index 57659f8c..c10adafd 100644
--- a/muse2/muse/midiedit/scoreedit.cpp
+++ b/muse2/muse/midiedit/scoreedit.cpp
@@ -1287,7 +1287,7 @@ ScoreCanvas::ScoreCanvas(ScoreEdit* pr, QWidget* parent_widget) : View(parent_wi
_pixels_per_whole_init = _pixels_per_whole_init;
note_velo=note_velo_init;
- note_velo_off_init=note_velo_off_init;
+ note_velo_off=note_velo_off_init;
dragging_staff=false;
@@ -3833,7 +3833,7 @@ void ScoreCanvas::mousePressEvent (QMouseEvent* event)
MusEGlobal::audio->msgAddEvent(newevent, curr_part, true, false, false);
- dragged_event_part=curr_part;
+ set_dragged_event_part(curr_part);
dragged_event=newevent;
original_dragged_event=dragged_event.clone();