oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Main: initialize Database before Storage

Browse Source
This commit is contained in:
Max Kellermann
2014-02-17 22:12:33 +01:00
parent 3af7af0b8f
commit 91729437a0
3 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/db/Configured.cxx
View File

@@ -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) {

2
src/db/Configured.hxx
View File

@@ -34,6 +34,6 @@ class Error;
*/
Database *
CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener,
bool have_storage, bool &is_simple_r, Error &error);
bool &is_simple_r, Error &error);
#endif