aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/move.c
diff options
context:
space:
mode:
authorRonan Pigott <rpigott@berkeley.edu>2020-10-21 09:42:40 -0700
committerTudor Brindus <me@tbrindus.ca>2020-10-24 02:15:30 -0400
commitd06c1ac1e96c3a5716b6dd8e5ee443674df36020 (patch)
tree077245ce5373bd818a97f06a51781999a04ef1fc /sway/commands/move.c
parent1be66c98f2c06add500bdb9d4b98b6183ab8141f (diff)
commands/move: fix crash when moving sphsc child
Diffstat (limited to 'sway/commands/move.c')
-rw-r--r--sway/commands/move.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c
index 959e5bfb..876a5616 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -537,7 +537,8 @@ static struct cmd_results *cmd_move_container(bool no_auto_back_and_forth,
struct sway_node *focus = seat_get_focus(seat);
// move container
- if (container->scratchpad) {
+ if (container_is_scratchpad_hidden_or_child(container)) {
+ container_detach(container);
root_scratchpad_show(container);
}
switch (destination->type) {