Main: call daemonize_finish() with AtScopeExit()

fbfefcc0 · Max Kellermann · b4c517c5 · fbfefcc0
Commit fbfefcc0 authored Aug 06, 2018 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

Main.cxx src/Main.cxx +1 -4

No files found.
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -526,6 +526,7 @@ MainOrThrow(int argc, char *argv[])
 #ifdef ENABLE_DAEMON
 	daemonize_set_user();
 	daemonize_begin(options.daemon);
+	AtScopeExit() { daemonize_finish(); };
 #endif

 	return mpd_main_after_fork(raw_config, config);
@@ -715,10 +716,6 @@ mpd_main_after_fork(const ConfigData &raw_config, const Config &config)
 	delete instance;
 	instance = nullptr;

-#ifdef ENABLE_DAEMON
-	daemonize_finish();
-#endif
-
 	return EXIT_SUCCESS;
 }