mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-12 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle NULL from output_get_active_workspace

Browse source 
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.
This commit is contained in:
Brian Ashworth 2019-02-21 13:24:13 -05:00 • committed by Drew DeVault
parent dca6c2ad8f
commit 42d2555529
10 changed files with 50 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/tree/container.c
View file

@ -831,7 +831,7 @@ void container_floating_move_to(struct sway_container *con,
}
struct sway_workspace *new_workspace =
output_get_active_workspace(new_output);
if (old_workspace != new_workspace) {
if (new_workspace && old_workspace != new_workspace) {
container_detach(con);
workspace_add_floating(new_workspace, con);
arrange_workspace(old_workspace);