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

Main: create UpdateService instance in glue_db_init_and_load()

This commit is contained in:
Max Kellermann 2014-02-04 10:09:09 +01:00
parent c953904343
commit f00710a57e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Instance.hxx
View File

@ -62,6 +62,12 @@ struct Instance final
Partition *partition;
Instance() {
#ifdef ENABLE_DATABASE
update = nullptr;
#endif
}
#ifdef ENABLE_DATABASE
void DeleteSong(const char *uri);

11
src/Main.cxx
View File

@ -204,8 +204,13 @@ glue_db_init_and_load(void)
if (!DatabaseGlobalOpen(error))
FatalError(error);
if (!db_is_simple())
return true;
instance->update = new UpdateService(*main_loop, db_get_simple());
/* run database update after daemonization? */
return !db_is_simple() || db_exists();
return db_exists();
}
#endif
@ -459,10 +464,6 @@ int mpd_main(int argc, char *argv[])
#ifdef ENABLE_DATABASE
const bool create_db = !glue_db_init_and_load();
instance->update = db_is_simple()
? new UpdateService(*main_loop, db_get_simple())
: nullptr;
#endif
glue_sticker_init();