3 files changed, 6 insertions, 5 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 25f454bd..d7733855 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1110,9 +1110,6 @@ static void seat_end_move_tiling(struct sway_seat *seat) {
         int after = edge != WLR_EDGE_TOP && edge != WLR_EDGE_LEFT;
 
         container_detach(con);
-        if (old_parent) {
-                container_reap_empty(old_parent);
-        }
 
         // Moving container into empty workspace
         if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) {
@@ -1135,6 +1132,10 @@ static void seat_end_move_tiling(struct sway_seat *seat) {
                 workspace_insert_tiling(new_ws, con, after);
         }
 
+        if (old_parent) {
+                container_reap_empty(old_parent);
+        }
+
         // This is a bit dirty, but we'll set the dimensions to that of a sibling.
         // I don't think there's any other way to make it consistent without
         // changing how we auto-size containers.
diff --git a/swaybar/input.c b/swaybar/input.c
index 31137f44..d0191f51 100644
--- a/swaybar/input.c
+++ b/swaybar/input.c
@@ -4,6 +4,7 @@
 #else
 #include <linux/input-event-codes.h>
 #endif
+#include <stdlib.h>
 #include <wayland-client.h>
 #include <wayland-cursor.h>
 #include <wlr/util/log.h>
diff --git a/swaylock/main.c b/swaylock/main.c
index 86dfd577..f2bb5c3e 100644
--- a/swaylock/main.c
+++ b/swaylock/main.c
@@ -385,7 +385,6 @@ static void load_image(char *arg, struct swaylock_state *state) {
                 return;
         }
         wl_list_insert(&state->images, &image->link);
-        state->args.mode = BACKGROUND_MODE_FILL;
         wlr_log(WLR_DEBUG, "Loaded image %s for output %s",
                         image->path, image->output_name ? image->output_name : "*");
 }
@@ -851,7 +850,7 @@ int main(int argc, char **argv) {
 
         enum line_mode line_mode = LM_LINE;
         state.args = (struct swaylock_args){
-                .mode = BACKGROUND_MODE_SOLID_COLOR,
+                .mode = BACKGROUND_MODE_FILL,
                 .font = strdup("sans-serif"),
                 .radius = 50,
                 .thickness = 10,