Skip to content

M
mpd
Commit 148c38fb authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Main: use AtScopeExit() to delete the Instance

parent fbfefcc0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/Main.cxx
View file @ 148c38fb
...@@ -502,6 +502,10 @@ MainOrThrow(int argc, char *argv[]) ...@@ -502,6 +502,10 @@ MainOrThrow(int argc, char *argv[])
log_init(raw_config, options.verbose, options.log_stderr); log_init(raw_config, options.verbose, options.log_stderr);
instance = new Instance(); instance = new Instance();
AtScopeExit() {
delete instance;
instance = nullptr;
};
#ifdef ENABLE_NEIGHBOR_PLUGINS #ifdef ENABLE_NEIGHBOR_PLUGINS
instance->neighbors = new NeighborGlue(); instance->neighbors = new NeighborGlue();
...@@ -713,8 +717,6 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config) ...@@ -713,8 +717,6 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
#ifndef ANDROID #ifndef ANDROID
SignalHandlersFinish(); SignalHandlersFinish();
#endif #endif
delete instance;
instance = nullptr;
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