change behaviour of play-at-edit-point....; fix crash in SAE context with automation button; new SAE logos etc

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2801 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 2 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index c850b835d7..14c89e8ee4 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4119,16 +4119,21 @@ Editor::sort_track_selection ()
 }
 
 nframes64_t
-Editor::get_preferred_edit_position()
+Editor::get_preferred_edit_position (bool ignore_playhead)
 {
 	bool ignored;
 	nframes64_t where = 0;
+	EditPoint ep = _edit_point;
 
 	if (entered_marker) {
 		return entered_marker->position();
 	}
 
-	switch (_edit_point) {
+	if (ignore_playhead && ep == EditAtPlayhead) {
+		ep = EditAtSelectedMarker;
+	}
+
+	switch (ep) {
 	case EditAtPlayhead:
 		where = session->audible_frame();
 		break;