diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-05-25 11:30:12 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:17 +1000 |
| commit | de5f8dd3d35b429a3d7135bf8b48703a1aea2a24 (patch) | |
| tree | 4471dd0d924d2cd41b518ee7fac297d481217dba | |
| parent | a9921c10eb7d498946c756c184ae67422bff76c0 (diff) | |
Temper pants - fix newly added lockup while dragging tempos sometimes.
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index e7fa7023e1..44ca5ad770 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3311,8 +3311,6 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) } - framepos_t pf; - if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier ())) { /* use vertical movement to alter tempo .. should be log */ double new_bpm = _real_section->beats_per_minute() + ((last_pointer_y() - current_pointer_y()) / 5.0); @@ -3326,7 +3324,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) TempoMap& map (_editor->session()->tempo_map()); const bool was_music = _real_section->position_lock_style() == MusicTime; - pf = adjusted_current_frame (event); + const framepos_t pf = adjusted_current_frame (event); if (!_editor->snap_musical()) { @@ -3359,7 +3357,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move) /* this has moved the bar lines themselves, so recalibrate the offset */ setup_pointer_frame_offset(); - _marker->set_position (pf); + _marker->set_position (adjusted_current_frame (event, false)); } void |