2 files changed, 5 insertions, 0 deletions

diff --git a/sway/commands/seat/attach.c b/sway/commands/seat/attach.c
index 80ec63ce..3e771c00 100644
--- a/sway/commands/seat/attach.c
+++ b/sway/commands/seat/attach.c
@@ -12,6 +12,8 @@ struct cmd_results *seat_cmd_attach(int argc, char **argv) {
         if ((error = checkarg(argc, "attach", EXPECTED_AT_LEAST, 1))) {
                 return error;
         }
+        struct seat_config *current_seat_config =
+                config->handler_context.seat_config;
         if (!current_seat_config) {
                 return cmd_results_new(CMD_FAILURE, "attach", "No seat defined");
         }
diff --git a/sway/commands/seat/fallback.c b/sway/commands/seat/fallback.c
index 7c129aae..56feaab5 100644
--- a/sway/commands/seat/fallback.c
+++ b/sway/commands/seat/fallback.c
@@ -9,6 +9,8 @@ struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
         if ((error = checkarg(argc, "fallback", EXPECTED_AT_LEAST, 1))) {
                 return error;
         }
+        struct seat_config *current_seat_config =
+                config->handler_context.seat_config;
         if (!current_seat_config) {
                 return cmd_results_new(CMD_FAILURE, "fallback", "No seat defined");
         }
@@ -20,6 +22,7 @@ struct cmd_results *seat_cmd_fallback(int argc, char **argv) {
         } else if (strcasecmp(argv[0], "false") == 0) {
                 new_config->fallback = 0;
         } else {
+                free_seat_config(new_config);
                 return cmd_results_new(CMD_INVALID, "fallback",
                         "Expected 'fallback <true|false>'");
         }