Main: catch and log C++ exceptions

a2e00834 · Max Kellermann · a1ef0159 · a2e00834
Commit a2e00834 authored Feb 07, 2016 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

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

No files found.
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -533,7 +533,7 @@ int mpd_main(int argc, char *argv[])
 }

 static int mpd_main_after_fork(struct options options)
-{
+try {
 	Error error;

 	GlobalEvents::Initialize(*instance->event_loop);
@@ -746,6 +746,9 @@ static int mpd_main_after_fork(struct options options)

 	log_deinit();
 	return EXIT_SUCCESS;
+} catch (const std::exception &e) {
+	LogError(e);
+	return EXIT_FAILURE;
 }

 #ifdef ANDROID