aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2012-03-23 10:32:02 -0500
committerMax Kellermann <max@duempel.org>2012-03-26 17:30:06 +0200
commit1a57fa095f3aefe7a1fb9f37a9432cdda33e9f3f (patch)
tree56f95f4f5654e8a918b5e062a54e16b69135d879 /src
parent167242fec045a104e91ca142fb3bd38af8cb78bb (diff)
downloadmpd-1a57fa095f3aefe7a1fb9f37a9432cdda33e9f3f.tar.gz
mpd-1a57fa095f3aefe7a1fb9f37a9432cdda33e9f3f.tar.xz
mpd-1a57fa095f3aefe7a1fb9f37a9432cdda33e9f3f.zip
Fix processing of sticker database path
After a previous refactor, the current code fails on paths that need expansion (e.g, '~/.mpd/sticker.db'), because we are not passing the correct path to the sticker database code. Pass the expanded (and previously unused) string instead of the original string. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main.c b/src/main.c
index 687e86f7e..4a10f1433 100644
--- a/src/main.c
+++ b/src/main.c
@@ -194,8 +194,7 @@ glue_sticker_init(void)
if (sticker_file == NULL && error != NULL)
MPD_ERROR("%s", error->message);
- if (!sticker_global_init(config_get_string(CONF_STICKER_FILE, NULL),
- &error))
+ if (!sticker_global_init(sticker_file, &error))
MPD_ERROR("%s", error->message);
g_free(sticker_file);