diff options
| author | Robin Gareus <robin@gareus.org> | 2015-10-18 02:01:45 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-10-18 02:03:41 +0200 |
| commit | f3070808084688b3993c12b6b9dc50312e16246f (patch) | |
| tree | 2ac179e86c6c281b9aa6459e00ffd900456b80c3 /gtk2_ardour/ardour_ui.cc | |
| parent | a5dcccae60d3f9524e5d313f4b71b62f9309af6d (diff) | |
disable follow-edits with external sync #6577
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 9f9ae71fed..e29c1bbf8d 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2108,7 +2108,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode) if (affect_transport) { if (rolling) { _session->request_stop (with_abort, true); - } else { + } else if (!_session->config.get_external_sync()) { if (UIConfiguration::instance().get_follow_edits() && ( editor->get_selection().time.front().start == _session->transport_frame() ) ) { //if playhead is exactly at the start of a range, we can assume it was placed there by follow_edits _session->request_play_range (&editor->get_selection().time, true); _session->set_requested_return_frame( editor->get_selection().time.front().start ); //force an auto-return here @@ -2286,7 +2286,7 @@ ARDOUR_UI::map_transport_state () auto_loop_button.set_active (false); } - if (UIConfiguration::instance().get_follow_edits()) { + if (UIConfiguration::instance().get_follow_edits() && !_session->config.get_external_sync()) { /* light up both roll and play-selection if they are joined */ roll_button.set_active (true); play_selection_button.set_active (true); |