X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/3178089935849dbafedf7c73f611cdef67994100..515cd2bb4f4ec548f464edeb5be7564fa5b0139f:/server/disorderd.c?ds=sidebyside diff --git a/server/disorderd.c b/server/disorderd.c index 3cb56d0..f4a1a62 100644 --- a/server/disorderd.c +++ b/server/disorderd.c @@ -186,7 +186,8 @@ static void volumecheck_after(long offset) { /* We fix the path to include the bindir and sbindir we were installed into */ static void fix_path(void) { char *path = getenv("PATH"); - char *newpath; + static char *newpath; + /* static or libgc collects it! */ if(!path) error(0, "PATH is not set at all!"); @@ -243,7 +244,7 @@ int main(int argc, char **argv) { ev = ev_new(); if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed"); /* read config */ - if(config_read()) + if(config_read(1)) fatal(0, "cannot read configuration"); /* Start the speaker process (as root! - so it can choose its nice value) */ speaker_setup(ev); @@ -289,7 +290,7 @@ int main(int argc, char **argv) { /* periodically tidy up the database */ dbgc_after(60); /* periodically check the volume */ - volumecheck_after(60); + volumecheck_again(0, 0, 0); /* set initial state */ add_random_track(); play(ev);