aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-07 22:39:17 +0100
committerMax Kellermann <max@duempel.org>2014-02-07 22:39:17 +0100
commit5e4dd4be9c1f971f293e010b223500d5f941baf3 (patch)
tree36b3a36a3e6bba44fb297b2f2f7a758de47713b1
parent04d5896c1c13a64f18ed5b2eb9c8eb6550cbf5c8 (diff)
downloadmpd-5e4dd4be9c1f971f293e010b223500d5f941baf3.tar.gz
mpd-5e4dd4be9c1f971f293e010b223500d5f941baf3.tar.xz
mpd-5e4dd4be9c1f971f293e010b223500d5f941baf3.zip
Main: allow playlist directory without music directory
-rw-r--r--NEWS1
-rw-r--r--src/Main.cxx5
2 files changed, 2 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 4547bc5c3..6dbf69390 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ ver 0.19 (not yet released)
- increase kernel timer slack on Linux
- name each thread (for debugging)
* new resampler option using libsoxr
+* allow playlist directory without music directory
ver 0.18.8 (2014/02/07)
* decoder
diff --git a/src/Main.cxx b/src/Main.cxx
index e2bcaf4ec..ebdecbb5d 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -142,11 +142,8 @@ glue_mapper_init(Error &error)
if (playlist_dir.IsNull() && error.IsDefined())
return false;
- if (music_dir.IsNull()) {
+ if (music_dir.IsNull())
music_dir = GetUserMusicDir();
- if (music_dir.IsNull())
- return true;
- }
mapper_init(std::move(music_dir), std::move(playlist_dir));
return true;