summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_drag.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@glw.com>2012-11-28 17:03:39 +0000
committerBen Loftis <ben@glw.com>2012-11-28 17:03:39 +0000
commit613021bff17b10b10c0924ed3d83bc202f1725c3 (patch)
tree8453875c5ba43023a129b6db06e605c8f7713cd8 /gtk2_ardour/editor_drag.cc
parent8cbd5a8bec5b8b3222735ec733e37527559e908e (diff)
tweak Auto Play behavior: dont auto-play a range selection if the auto-play option is on; but note that this is still possible if both auto-play and follow-edits is on
git-svn-id: svn://localhost/ardour2/branches/3.0@13562 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
-rw-r--r--gtk2_ardour/editor_drag.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index bac7c675c3..e8bce456e8 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3601,10 +3601,10 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
/* XXX what if its a music time selection? */
if (s) {
- if ((s->config.get_auto_play() || (s->get_play_range() && s->transport_rolling()))) {
+ if ( s->get_play_range() && s->transport_rolling() ) {
s->request_play_range (&_editor->selection->time, true);
} else {
- if (Config->get_always_play_range()) {
+ if (Config->get_always_play_range() && !s->transport_rolling()) {
s->request_locate (_editor->get_selection().time.start());
}
}