From c4a8dfddfe6f43c91b87e0b5046a6b3da3442dc3 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 17 Jun 2021 11:07:08 -0400
Subject: [PATCH] Sync SessionController::remove_marker_at_playhead() with
 Editor

---
 libs/ardour/ardour/session_controller.h | 2 +-
 libs/ardour/session_controller.cc       | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libs/ardour/ardour/session_controller.h b/libs/ardour/ardour/session_controller.h
index dee2897cdd..eb6812ff31 100644
--- a/libs/ardour/ardour/session_controller.h
+++ b/libs/ardour/ardour/session_controller.h
@@ -74,7 +74,7 @@ public:
 	/* Markers */
 
 	void add_marker (const std::string& = std::string ());
-	void remove_marker_at_playhead ();
+	bool remove_marker_at_playhead ();
 
 	/* Locating */
 
diff --git a/libs/ardour/session_controller.cc b/libs/ardour/session_controller.cc
index 64598d8188..7d6d7610c4 100644
--- a/libs/ardour/session_controller.cc
+++ b/libs/ardour/session_controller.cc
@@ -355,13 +355,13 @@ SessionController::add_marker (const std::string& markername)
 	_session->commit_reversible_command ();
 }
 
-void
+bool
 SessionController::remove_marker_at_playhead ()
 {
+	bool removed = false;
 	if (_session) {
 		// set up for undo
-		XMLNode& before  = _session->locations ()->get_state ();
-		bool     removed = false;
+		XMLNode& before = _session->locations ()->get_state ();
 
 		// find location(s) at this time
 		Locations::LocationList locs;
@@ -388,6 +388,8 @@ SessionController::remove_marker_at_playhead ()
 			_session->commit_reversible_command ();
 		}
 	}
+
+	return removed;
 }
 
 /* Locating */