aboutsummaryrefslogtreecommitdiffstats
path: root/src/Main.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-11-29 22:33:30 +0100
committerMax Kellermann <max@duempel.org>2014-11-29 23:36:44 +0100
commitfd2c6b8a4b059bd810ca8511fa8f66001843284c (patch)
tree3244bbfa951be5bb79094067c0f816e6c84f7f12 /src/Main.cxx
parent5b1db917bc63fcacfc503ebc02251a2905bc2f8f (diff)
downloadmpd-fd2c6b8a4b059bd810ca8511fa8f66001843284c.tar.gz
mpd-fd2c6b8a4b059bd810ca8511fa8f66001843284c.tar.xz
mpd-fd2c6b8a4b059bd810ca8511fa8f66001843284c.zip
fs/Charset: return Error on SetFSCharset() failure
Don't abort the process, let the caller decide instead.
Diffstat (limited to '')
-rw-r--r--src/Main.cxx5
1 files changed, 4 insertions, 1 deletions
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);