Commit 692c8025 authored by Max Kellermann's avatar Max Kellermann

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

parent a6dc1ab0
...@@ -548,6 +548,11 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config) ...@@ -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) ...@@ -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) {
instance->neighbors->Close();
delete instance->neighbors; delete instance->neighbors;
}
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
......
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