alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

cmd_floating: Don't add non-float as sibling to float.

Browse source 
When turning a float to a non-float, `get_focused_container` might
return another floating view, causing the active view to be inserted
into the floating list on its workspace instead of the normal child list
which it should. (Since it has `is_floating` as false the resulting
discrepency triggered other bad behaviour eventually leading sway to
crash.)

This patch fixes that by simply checking floating status before making
it a sibling.
This commit is contained in:
S. Christoffer Eliesen 2015-11-28 23:48:22 +01:00
parent 01c5349e1a
commit badfb4bb43
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/commands.c
View file

@ -344,14 +344,12 @@ static struct cmd_results *cmd_floating(int argc, char **argv) {
} else if (view->is_floating && !wants_floating) { } else if (view->is_floating && !wants_floating) {
// Delete the view from the floating list and unset its is_floating flag // Delete the view from the floating list and unset its is_floating flag
// Using length-1 as the index is safe because the view must be the currently
// focused floating output
remove_child(view); remove_child(view);
view->is_floating = false; view->is_floating = false;
// Get the properly focused container, and add in the view there // Get the properly focused container, and add in the view there
swayc_t *focused = container_under_pointer(); swayc_t *focused = container_under_pointer();
// If focused is null, it's because the currently focused container is a workspace // If focused is null, it's because the currently focused container is a workspace
if (focused == NULL) { if (focused == NULL || focused->is_floating) {
focused = swayc_active_workspace(); focused = swayc_active_workspace();
} }
set_focused_container(focused); set_focused_container(focused);