Merge topic branch t/home into pu

[paraslash.git] / mixer.c

diff --git a/mixer.c b/mixer.c
index dda7fc1df729722266db7136733a28ac2391e977..a5c415f7265388fa1e0ef3c34b051190d70f378e 100644 (file)
--- a/mixer.c
+++ b/mixer.c
@@ -609,12 +609,13 @@ free_sub_lpr:
        lls_free_parse_result(sub_lpr, cmd);
 free_lpr:
        lls_free_parse_result(lpr, CMD_PTR(PARA_MIXER));
-       if (ret >= 0)
-               return EXIT_SUCCESS;
 fail:
-       if (errctx)
-               PARA_ERROR_LOG("%s\n", errctx);
-       free(errctx);
-       PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-       return EXIT_FAILURE;
+       if (ret < 0) {
+               if (errctx)
+                       PARA_ERROR_LOG("%s\n", errctx);
+               free(errctx);
+               PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+       }
+       free(get_confdir());
+       return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
 }