aboutsummaryrefslogtreecommitdiffstats
path: root/src/db/Selection.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2015-06-25 23:14:40 +0200
committerMax Kellermann <max@duempel.org>2015-06-25 23:15:36 +0200
commiteb86fdfbea6254d6966e59d80b43af3e5152fe3f (patch)
treec41d5e1a2b3750ec2c5b34155fbfb6bbdeb0dc5d /src/db/Selection.cxx
parentc7712e2ef0232a39786075dbf6683120cfe5cc0a (diff)
downloadmpd-eb86fdfbea6254d6966e59d80b43af3e5152fe3f.tar.gz
mpd-eb86fdfbea6254d6966e59d80b43af3e5152fe3f.tar.xz
mpd-eb86fdfbea6254d6966e59d80b43af3e5152fe3f.zip
SongFilter: return "const char *" instead of std::string
Diffstat (limited to 'src/db/Selection.cxx')
-rw-r--r--src/db/Selection.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/db/Selection.cxx b/src/db/Selection.cxx
index 4a4016485..4c941823a 100644
--- 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