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

Main: use AtScopeExit() to delete the Instance

Browse Source
This commit is contained in:
Max Kellermann 2018-08-06 11:42:46 +02:00
parent fbfefcc0a3
commit 148c38fbb9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Main.cxx
View File

@ -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)
#ifndef ANDROID #ifndef ANDROID
SignalHandlersFinish(); SignalHandlersFinish();
#endif #endif
delete instance;
instance = nullptr;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }