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

Main: use AtScopeExit() to call ZeroconfDeinit() 

Make sure that ZeroconfDeinit() gets called even if startup fails with
an exception.  Fixes an assertion failure because an Avahi TimerEvent
is still active.

Closes https://github.com/MusicPlayerDaemon/MPD/issues/1192
This commit is contained in:
Max Kellermann 2021-06-22 20:31:09 +02:00
parent ab487b9a99
commit 175d2c6d29
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main.cxx
View File

@ -477,6 +477,7 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
#endif #endif
ZeroconfInit(raw_config, instance.event_loop); ZeroconfInit(raw_config, instance.event_loop);
AtScopeExit() { ZeroconfDeinit(); };
#ifdef ENABLE_DATABASE #ifdef ENABLE_DATABASE
if (create_db) { if (create_db) {
@ -537,9 +538,6 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
instance.state_file->Write(); instance.state_file->Write();
instance.BeginShutdownUpdate(); instance.BeginShutdownUpdate();
ZeroconfDeinit();
instance.BeginShutdownPartitions(); instance.BeginShutdownPartitions();
} }