diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-02-21 13:24:13 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-02-25 17:10:04 -0500 |
commit | 42d25555293db5489036b0cd4128f6f45e383637 (patch) | |
tree | 1343100e914d7a29e38cfae078fe9225931032e0 /sway/tree/container.c | |
parent | output_get_active_workspace: check workspaces length (diff) | |
download | sway-42d25555293db5489036b0cd4128f6f45e383637.tar.gz sway-42d25555293db5489036b0cd4128f6f45e383637.tar.zst sway-42d25555293db5489036b0cd4128f6f45e383637.zip |
Handle NULL from output_get_active_workspace
This modifies the places where output_get_active_workspace is called to
handle a NULL result. Some places already handled it and did not need a
change, some just have guard off code blocks, others return errors, and
some have sway_asserts since the case should never happen. A lot of this
is probably just safety precautions since they probably will never be
called when `output_get_active_workspace` is not fully configured with a
workspace.
Diffstat (limited to 'sway/tree/container.c')
-rw-r--r-- | sway/tree/container.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c index 9358dad7..933907f4 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -831,7 +831,7 @@ void container_floating_move_to(struct sway_container *con, | |||
831 | } | 831 | } |
832 | struct sway_workspace *new_workspace = | 832 | struct sway_workspace *new_workspace = |
833 | output_get_active_workspace(new_output); | 833 | output_get_active_workspace(new_output); |
834 | if (old_workspace != new_workspace) { | 834 | if (new_workspace && old_workspace != new_workspace) { |
835 | container_detach(con); | 835 | container_detach(con); |
836 | workspace_add_floating(new_workspace, con); | 836 | workspace_add_floating(new_workspace, con); |
837 | arrange_workspace(old_workspace); | 837 | arrange_workspace(old_workspace); |