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

Main: use AtScopeExit() to call NeighborGlue::Close()

Browse Source
This commit is contained in:
Max Kellermann
2019-04-25 13:03:51 +02:00
parent a6dc1ab0a9
commit 692c8025a2
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Main.cxx
View File

@@ -548,6 +548,11 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
#ifdef ENABLE_NEIGHBOR_PLUGINS #ifdef ENABLE_NEIGHBOR_PLUGINS
if (instance->neighbors != nullptr) if (instance->neighbors != nullptr)
instance->neighbors->Open(); instance->neighbors->Open();
AtScopeExit() {
if (instance->neighbors != nullptr)
instance->neighbors->Close();
};
#endif #endif
ZeroconfInit(raw_config, instance->event_loop); ZeroconfInit(raw_config, instance->event_loop);
@@ -621,10 +626,7 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
delete instance->client_list; delete instance->client_list;
#ifdef ENABLE_NEIGHBOR_PLUGINS #ifdef ENABLE_NEIGHBOR_PLUGINS
if (instance->neighbors != nullptr) { delete instance->neighbors;
instance->neighbors->Close();
delete instance->neighbors;
}
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;