From 04ba433ca631f0c3f51b067a6b55dc1046bd287e Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 20 Feb 2014 00:03:49 +0100
Subject: Main: initialize Partition before Listener

Fixes nullptr dereference (regression by commit df5f9f4a).
---
 src/Main.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/Main.cxx b/src/Main.cxx
index c9de56873..cfb2dcc92 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -432,6 +432,8 @@ int mpd_main(int argc, char *argv[])
 	const unsigned max_clients = config_get_positive(CONF_MAX_CONN, 10);
 	instance->client_list = new ClientList(max_clients);
 
+	initialize_decoder_and_player();
+
 	if (!listen_global_init(*instance->event_loop, *instance->partition,
 				error)) {
 		LogError(error);
@@ -475,7 +477,6 @@ int mpd_main(int argc, char *argv[])
 	glue_sticker_init();
 
 	command_init();
-	initialize_decoder_and_player();
 	initAudioConfig();
 	instance->partition->outputs.Configure(*instance->event_loop,
 					       instance->partition->pc);
-- 
cgit v1.2.3