aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-03-01 18:35:17 +0100
committerMax Kellermann <max@duempel.org>2014-03-01 18:45:09 +0100
commit350d2bcd6e610acd328eb547120c6036ecf6c573 (patch)
treec0fe39fd6028548f3bd236ef05120f09de32af74
parentb2c523e56d134eebe2dfe92aa9ed64bb300eb4a4 (diff)
downloadmpd-350d2bcd6e610acd328eb547120c6036ecf6c573.tar.gz
mpd-350d2bcd6e610acd328eb547120c6036ecf6c573.tar.xz
mpd-350d2bcd6e610acd328eb547120c6036ecf6c573.zip
storage/Configured: fix fallback music directory
This was accidently disabled when storage plugins were introduced.
-rw-r--r--src/storage/Configured.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/storage/Configured.cxx b/src/storage/Configured.cxx
index 29e511c7a..800a18ba0 100644
--- a/src/storage/Configured.cxx
+++ b/src/storage/Configured.cxx
@@ -68,10 +68,7 @@ CreateConfiguredStorage(Error &error)
assert(!error.IsDefined());
auto uri = config_get_string(CONF_MUSIC_DIR, nullptr);
- if (uri == nullptr)
- return nullptr;
-
- if (uri_has_scheme(uri))
+ if (uri != nullptr && uri_has_scheme(uri))
return CreateConfiguredStorageUri(uri, error);
return CreateConfiguredStorageLocal(error);