SongFilter: return "const char *" instead of std::string

2015-06-25 23:14:40 +02:00
parent c7712e2ef0
commit eb86fdfbea
5 changed files with 18 additions and 15 deletions
--- a/src/db/Selection.cxx
+++ b/src/db/Selection.cxx
@@ -26,8 +26,11 @@ DatabaseSelection::DatabaseSelection(const char *_uri, bool _recursive,
 {
 	/* optimization: if the caller didn't specify a base URI, pick
 	   the one from SongFilter */
-	if (uri.empty() && filter != nullptr)
-		uri = filter->GetBase();
+	if (uri.empty() && filter != nullptr) {
+		auto base = filter->GetBase();
+		if (base != nullptr)
+			uri = base;
+	}
 }

 bool