From 4b20f713f3ce5a99f76404274ec7d209f062e907 Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Fri, 2 Mar 2018 13:05:30 +0100
Subject: [PATCH] Do not display show more for playlist if no playlist is found

---
 src/database/Playlist.cpp | 7 ++++++-
 src/ui/PlaylistView.cpp   | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/database/Playlist.cpp b/src/database/Playlist.cpp
index 47e259b3..c5b2e125 100644
--- a/src/database/Playlist.cpp
+++ b/src/database/Playlist.cpp
@@ -83,7 +83,12 @@ Playlist::getTracks(int offset, int size, bool& moreResults) const
 
 	moreResults = false;
 
-	Wt::Dbo::collection<Wt::Dbo::ptr<PlaylistEntry>> entries = session()->find<PlaylistEntry>().where("playlist_id = ?").bind(self().id()).orderBy("pos").offset(offset).limit(size + 1);
+	Wt::Dbo::collection<Wt::Dbo::ptr<PlaylistEntry>> entries
+		= session()->find<PlaylistEntry>()
+		.where("playlist_id = ?").bind(self().id())
+		.orderBy("pos")
+		.limit(size != -1 ? size + 1 : -1)
+		.offset(offset);
 
 	std::vector<Wt::Dbo::ptr<Track>> res;
 
diff --git a/src/ui/PlaylistView.cpp b/src/ui/PlaylistView.cpp
index b7a74384..4ee8f58f 100644
--- a/src/ui/PlaylistView.cpp
+++ b/src/ui/PlaylistView.cpp
@@ -48,6 +48,7 @@ Playlist::Playlist(Wt::WContainerWidget* parent)
 
 	_showMore = new Wt::WTemplate(Wt::WString::tr("template-show-more"));
 	_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
+	_showMore->setHidden(true);
 	container->bindWidget("show-more", _showMore);
 
 	_showMore->clicked().connect(std::bind([=]