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

Main: move code to InitDatabaseAndStorage()

Browse Source
This commit is contained in:
Max Kellermann 2014-02-17 21:42:58 +01:00
parent 1ddd00433e
commit 3af7af0b8f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Main.cxx
View File

@ -196,6 +196,17 @@ glue_db_init_and_load(void)
return db.FileExists();
}
static bool
InitDatabaseAndStorage()
{
Error error;
if (!InitStorage(error))
FatalError(error);
const bool create_db = !glue_db_init_and_load();
return create_db;
}
#endif
/**
@ -445,12 +456,7 @@ int mpd_main(int argc, char *argv[])
decoder_plugin_init_all();
#ifdef ENABLE_DATABASE
if (!InitStorage(error)) {
LogError(error);
return EXIT_FAILURE;
}
const bool create_db = !glue_db_init_and_load();
const bool create_db = InitDatabaseAndStorage();
#endif
glue_sticker_init();