diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2015-04-21 08:35:20 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2015-04-21 08:35:20 -0500 |
| commit | 91fac4c96dc6210dcc056da70dc608700d7eb570 (patch) | |
| tree | 93c24f138224d39975e6da4abaa4b36a521b970b /gtk2_ardour/editor.cc | |
| parent | f44e2e55fdd6e4d265f3eff715b071a27da8b5eb (diff) | |
| parent | d3d7428a189d031739f901472f016b2907752640 (diff) | |
merge fix for tempo branch
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 8ea9dd2f9a..09d70e40d6 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4661,9 +4661,9 @@ Editor::get_preferred_edit_position (bool ignore_playhead, bool from_context_men framepos_t where = 0; EditPoint ep = _edit_point; - if(Profile->get_mixbus()) + if (Profile->get_mixbus()) if (ep == EditAtSelectedMarker) - ep=EditAtPlayhead; + ep = EditAtPlayhead; if (from_outside_canvas && (ep == EditAtMouse)) { ep = EditAtPlayhead; @@ -4687,8 +4687,9 @@ Editor::get_preferred_edit_position (bool ignore_playhead, bool from_context_men /* XXX not right but what can we do ? */ return 0; } - } else + } else { where = _session->audible_frame(); + } DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where)); break; |