From 91729437a0c24c5aad8f223f64ee63e918fe8b91 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 17 Feb 2014 22:12:33 +0100 Subject: Main: initialize Database before Storage --- src/db/Configured.cxx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/db/Configured.cxx') diff --git a/src/db/Configured.cxx b/src/db/Configured.cxx index a6194dc5c..edd3159f9 100644 --- a/src/db/Configured.cxx +++ b/src/db/Configured.cxx @@ -28,7 +28,7 @@ Database * CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener, - bool have_storage, bool &is_simple_r, Error &error) + bool &is_simple_r, Error &error) { const struct config_param *param = config_get_param(CONF_DATABASE); const struct config_param *path = config_get_param(CONF_DB_FILE); @@ -40,18 +40,6 @@ CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener, return nullptr; } - if (!have_storage) { - if (param != nullptr) - LogDefault(config_domain, - "Found database setting without " - "music_directory - disabling database"); - if (path != nullptr) - LogDefault(config_domain, - "Found db_file setting without " - "music_directory - disabling database"); - return nullptr; - } - struct config_param *allocated = nullptr; if (param == nullptr && path != nullptr) { -- cgit v1.2.3