From 067f966a9b5ed7e8e28b5f2b483fb4650da9de88 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 15 May 2008 02:51:55 +0000
Subject: Fix default value handling when config file is not present

---
 audio/control.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'audio/control.c')

diff --git a/audio/control.c b/audio/control.c
index 6bf05bef..4e8b948d 100644
--- a/audio/control.c
+++ b/audio/control.c
@@ -915,14 +915,15 @@ int avrcp_init(DBusConnection *conn, GKeyFile *config)
 	if (avctp_server)
 		return 0;
 
-	tmp = g_key_file_get_boolean(config, "General", "Master",
-			&err);
-	if (err) {
-		debug("audio.conf: %s", err->message);
-		g_error_free(err);
-		err = NULL;
-	} else
-		master = tmp;
+	if (config) {
+		tmp = g_key_file_get_boolean(config, "General",
+							"Master", &err);
+		if (err) {
+			debug("audio.conf: %s", err->message);
+			g_error_free(err);
+		} else
+			master = tmp;
+	}
 
 	connection = dbus_connection_ref(conn);
 
-- 
cgit