Commit f00710a5 authored by Max Kellermann's avatar Max Kellermann

Main: create UpdateService instance in glue_db_init_and_load()

parent c9539043
...@@ -62,6 +62,12 @@ struct Instance final ...@@ -62,6 +62,12 @@ struct Instance final
Partition *partition; Partition *partition;
Instance() {
#ifdef ENABLE_DATABASE
update = nullptr;
#endif
}
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
void DeleteSong(const char *uri); void DeleteSong(const char *uri);
......
...@@ -204,8 +204,13 @@ glue_db_init_and_load(void) ...@@ -204,8 +204,13 @@ glue_db_init_and_load(void)
if (!DatabaseGlobalOpen(error)) if (!DatabaseGlobalOpen(error))
FatalError(error); FatalError(error);
if (!db_is_simple())
return true;
instance->update = new UpdateService(*main_loop, db_get_simple());
/* run database update after daemonization? */ /* run database update after daemonization? */
return !db_is_simple() || db_exists(); return db_exists();
} }
#endif #endif
...@@ -459,10 +464,6 @@ int mpd_main(int argc, char *argv[]) ...@@ -459,10 +464,6 @@ int mpd_main(int argc, char *argv[])
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
const bool create_db = !glue_db_init_and_load(); const bool create_db = !glue_db_init_and_load();
instance->update = db_is_simple()
? new UpdateService(*main_loop, db_get_simple())
: nullptr;
#endif #endif
glue_sticker_init(); glue_sticker_init();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment