summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2011-03-31 22:06:22 +0200
committerGravatar waker <wakeroid@gmail.com>2011-03-31 22:06:22 +0200
commit5c2f94c8bfa7b98b3c832d0ce11c6ecdbd474029 (patch)
treeeb92ff856f530485809ee0e2e0710f56f8d0155b /main.c
parent57de90e3b8958b4d5edf1bd0145f98623768caa9 (diff)
thread-safe config access
Diffstat (limited to 'main.c')
-rw-r--r--main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/main.c b/main.c
index d61b772f..d90eeee0 100644
--- a/main.c
+++ b/main.c
@@ -220,7 +220,8 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi
}
if (parg < pend) {
if (conf_get_int ("cli_add_to_specific_playlist", 1)) {
- const char *str = conf_get_str ("cli_add_playlist_name", "Default");
+ char str[200];
+ conf_get_str ("cli_add_playlist_name", "Default", str, sizeof (str));
int idx = plt_find (str);
if (idx < 0) {
idx = plt_add (plt_get_count (), str);
@@ -779,6 +780,7 @@ main (int argc, char *argv[]) {
pl_init ();
+ conf_init ();
conf_load (); // required by some plugins at startup
conf_set_str ("deadbeef_version", VERSION);