diff options
| author |  Ronan Pigott <rpigott@berkeley.edu> | 2020-10-21 09:42:40 -0700 |
|---|---|---|
| committer |  Tudor Brindus <me@tbrindus.ca> | 2020-10-24 02:15:30 -0400 |
| commit | d06c1ac1e96c3a5716b6dd8e5ee443674df36020 (patch) | |
| tree | 077245ce5373bd818a97f06a51781999a04ef1fc /sway/commands/move.c | |
| parent | commands/resize: don't consider 1px resizes to be invalid (diff) | |
| download | sway-d06c1ac1e96c3a5716b6dd8e5ee443674df36020.tar.gz sway-d06c1ac1e96c3a5716b6dd8e5ee443674df36020.tar.zst sway-d06c1ac1e96c3a5716b6dd8e5ee443674df36020.zip | |
commands/move: fix crash when moving sphsc child
Diffstat (limited to 'sway/commands/move.c')
| -rw-r--r-- | sway/commands/move.c | 3 |
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, | |||
| 537 | struct sway_node *focus = seat_get_focus(seat); | 537 | struct sway_node *focus = seat_get_focus(seat); |
| 538 | 538 | ||
| 539 | // move container | 539 | // move container |
| 540 | if (container->scratchpad) { | 540 | if (container_is_scratchpad_hidden_or_child(container)) { |
| 541 | container_detach(container); | ||
| 541 | root_scratchpad_show(container); | 542 | root_scratchpad_show(container); |
| 542 | } | 543 | } |
| 543 | switch (destination->type) { | 544 | switch (destination->type) { |