3 files changed, 8 insertions, 7 deletions

diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c
index 55cbdff0..4ed56c2a 100644
--- a/sway/commands/output/background.c
+++ b/sway/commands/output/background.c
@@ -72,7 +72,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                 src = strdup(p.we_wordv[0]);
                 wordfree(&p);
                 if (!src) {
-                        wlr_log(L_ERROR, "Failed to duplicate string");
+                        wlr_log(WLR_ERROR, "Failed to duplicate string");
                         return cmd_results_new(CMD_FAILURE, "output",
                                 "Unable to allocate resource");
                 }
@@ -80,9 +80,10 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                 if (config->reading && *src != '/') {
                         // src file is inside configuration dir
 
-                        char *conf = strdup(config->current_config);
-                        if(!conf) {
-                                wlr_log(L_ERROR, "Failed to duplicate string");
+                        char *conf = strdup(config->current_config_path);
+                        if (!conf) {
+                                wlr_log(WLR_ERROR, "Failed to duplicate string");
+                                free(src);
                                 return cmd_results_new(CMD_FAILURE, "output",
                                                 "Unable to allocate resources");
                         }
@@ -93,7 +94,7 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
                         if (!src) {
                                 free(rel_path);
                                 free(conf);
-                                wlr_log(L_ERROR, "Unable to allocate memory");
+                                wlr_log(WLR_ERROR, "Unable to allocate memory");
                                 return cmd_results_new(CMD_FAILURE, "output",
                                                 "Unable to allocate resources");
                         }
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
index daec6d44..ef56ae9e 100644
--- a/sway/commands/output/mode.c
+++ b/sway/commands/output/mode.c
@@ -36,11 +36,11 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
                 }
         } else {
                 // Format is 1234 4321
+                argc--; argv++;
                 if (!argc) {
                         return cmd_results_new(CMD_INVALID, "output",
                                 "Missing mode argument (height).");
                 }
-                argc--; argv++;
                 output->height = strtol(*argv, &end, 10);
                 if (*end) {
                         return cmd_results_new(CMD_INVALID, "output",
diff --git a/sway/commands/output/position.c b/sway/commands/output/position.c
index c2aeb281..449767b1 100644
--- a/sway/commands/output/position.c
+++ b/sway/commands/output/position.c
@@ -27,11 +27,11 @@ struct cmd_results *output_cmd_position(int argc, char **argv) {
                 }
         } else {
                 // Format is 1234 4321 (legacy)
+                argc--; argv++;
                 if (!argc) {
                         return cmd_results_new(CMD_INVALID, "output",
                                 "Missing position argument (y).");
                 }
-                argc--; argv++;
                 config->handler_context.output_config->y = strtol(*argv, &end, 10);
                 if (*end) {
                         return cmd_results_new(CMD_INVALID, "output",