X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2Fbasic_ui.cc;h=98e7adf949b7082812062c4f82d4553379603111;hb=bebe2af95ad9999fdca719450dc2c70cfb849076;hp=2ed82cd8c328d6a6f1d12d4e1ac766a6a4c87897;hpb=cafbc632fb71db817d399dce5f18be7528573a6f;p=ardour.git

diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index 2ed82cd8c3..98e7adf949 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -171,10 +171,10 @@ BasicUI::save_state ()
 void
 BasicUI::prev_marker ()
 {
-	Location *location = session->locations()->first_location_before (session->transport_frame());
+	framepos_t pos = session->locations()->first_mark_before (session->transport_frame());
 	
-	if (location) {
-		session->request_locate (location->start(), session->transport_rolling());
+	if (pos >= 0) {
+		session->request_locate (pos, session->transport_rolling());
 	} else {
 		session->goto_start ();
 	}
@@ -183,12 +183,12 @@ BasicUI::prev_marker ()
 void
 BasicUI::next_marker ()
 {
-	Location *location = session->locations()->first_location_after (session->transport_frame());
+	framepos_t pos = session->locations()->first_mark_after (session->transport_frame());
 
-	if (location) {
-		session->request_locate (location->start(), session->transport_rolling());
+	if (pos >= 0) {
+		session->request_locate (pos, session->transport_rolling());
 	} else {
-		session->request_locate (session->current_end_frame());
+		session->goto_end();
 	}
 }