From 561aef3736d81cd6a62fc04f53cdde324308f71a Mon Sep 17 00:00:00 2001
From: Ben Loftis <ben@harrisonconsoles.com>
Date: Fri, 28 May 2021 07:43:46 -0500
Subject: [PATCH] Playlist UI tweaks: always prompt the user for a new playlist
 name, not just for grouped playlists

---
 gtk2_ardour/editor.cc   | 4 ++--
 gtk2_ardour/route_ui.cc | 4 ++--
 gtk2_ardour/route_ui.h  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 121a33a8bb..7f07561ba8 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4401,13 +4401,13 @@ Editor::clear_playlists (RouteUI* rui)
 void
 Editor::mapped_use_new_playlist (RouteUI& rui, uint32_t sz, vector<boost::shared_ptr<ARDOUR::Playlist> > const & playlists)
 {
-	rui.use_new_playlist (sz > 1 ? false : true, playlists, false);
+	rui.use_new_playlist (playlists, false);
 }
 
 void
 Editor::mapped_use_copy_playlist (RouteUI& rui, uint32_t sz, vector<boost::shared_ptr<ARDOUR::Playlist> > const & playlists)
 {
-	rui.use_new_playlist (sz > 1 ? false : true, playlists, true);
+	rui.use_new_playlist (playlists, true);
 }
 
 void
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 0ace28a964..72586995f3 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -2435,7 +2435,7 @@ RouteUI::resolve_new_group_playlist_name (std::string const& basename, vector<bo
 }
 
 void
-RouteUI::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > const& playlists_before_op, bool copy)
+RouteUI::use_new_playlist (vector<boost::shared_ptr<Playlist> > const& playlists_before_op, bool copy)
 {
 	string name;
 
@@ -2459,7 +2459,7 @@ RouteUI::use_new_playlist (bool prompt, vector<boost::shared_ptr<Playlist> > con
 		name = Playlist::bump_name (name, *_session);
 	}
 
-	if (prompt) {
+	{
 		// TODO: The prompter "new" button should be de-activated if the user
 		// specifies a playlist name which already exists in the session.
 
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index fc2776f52e..838e4e14ae 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -158,7 +158,7 @@ public:
 	void fan_out (bool to_busses = true, bool group = true);
 
 	/* The editor calls these when mapping an operation across multiple tracks */
-	void use_new_playlist (bool prompt, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const&, bool copy);
+	void use_new_playlist (std::vector<boost::shared_ptr<ARDOUR::Playlist> > const&, bool copy);
 	void clear_playlist ();
 
 	void        use_playlist (Gtk::RadioMenuItem* item, boost::weak_ptr<ARDOUR::Playlist> wpl);