summaryrefslogtreecommitdiffstats
path: root/audio/control.c
diff options
context:
space:
mode:
Diffstat (limited to 'audio/control.c')
-rw-r--r--audio/control.c17
1 files changed, 9 insertions, 8 deletions
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);