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 <d...@archlinux.org>
---
 src/main.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index 687e86f..4a10f14 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);
-- 
1.7.9.4


------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team

Reply via email to