From fd2c6b8a4b059bd810ca8511fa8f66001843284c Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 29 Nov 2014 22:33:30 +0100
Subject: fs/Charset: return Error on SetFSCharset() failure

Don't abort the process, let the caller decide instead.
---
 src/Main.cxx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/Main.cxx')

diff --git a/src/Main.cxx b/src/Main.cxx
index b1960b5f2..418e69644 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -551,7 +551,10 @@ static int mpd_main_after_fork(struct options options)
 	GlobalEvents::Register(GlobalEvents::SHUTDOWN, shutdown_event_emitted);
 #endif
 
-	ConfigureFS();
+	if (!ConfigureFS(error)) {
+		LogError(error);
+		return EXIT_FAILURE;
+	}
 
 	if (!glue_mapper_init(error)) {
 		LogError(error);
-- 
cgit v1.2.3