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

Merge tag 'v0.22.9'

Browse Source 
release v0.22.9
This commit is contained in:
Max Kellermann
2021-06-23 21:02:06 +02:00
parent f789451007 18628bf89e
commit e4e4576a39
12 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Main.cxx
View File

@@ -489,6 +489,15 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
LogError(std::current_exception(),
"Zeroconf initialization failed");
}
AtScopeExit(&zeroconf, &instance) {
if (zeroconf) {
auto &event_loop = instance.io_thread.GetEventLoop();
BlockingCall(event_loop, [&](){
zeroconf.reset();
});
}
};
#endif
#ifdef ENABLE_DATABASE
@@ -550,16 +559,6 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
instance.state_file->Write();
instance.BeginShutdownUpdate();
#ifdef HAVE_ZEROCONF
if (zeroconf) {
auto &event_loop = instance.io_thread.GetEventLoop();
BlockingCall(event_loop, [&](){
zeroconf.reset();
});
}
#endif
instance.BeginShutdownPartitions();
}