fixed vanishing floating view

2 files changed, 10 insertions, 8 deletions

diff --git a/sway/container.c b/sway/container.c
index 67a34551..127e1ecd 100644
--- a/sway/container.c
+++ b/sway/container.c
@@ -299,7 +299,8 @@ swayc_t *destroy_workspace(swayc_t *workspace) {
                 return NULL;
         }
 
-        if (workspace->children->length == 0) {
+        // Do not destroy if there are children
+        if (workspace->children->length == 0 && workspace->floating->length == 0) {
                 sway_log(L_DEBUG, "%s: '%s'", __func__, workspace->name);
                 swayc_t *parent = workspace->parent;
                 free_swayc(workspace);
@@ -466,14 +467,16 @@ bool swayc_is_fullscreen(swayc_t *view) {
 // Mapping
 
 void container_map(swayc_t *container, void (*f)(swayc_t *view, void *data), void *data) {
-        if (container && container->children && container->children->length)  {
+        if (container) {
                 int i;
-                for (i = 0; i < container->children->length; ++i) {
-                        swayc_t *child = container->children->items[i];
-                        f(child, data);
-                        container_map(child, f, data);
+                if (container->children)  {
+                        for (i = 0; i < container->children->length; ++i) {
+                                swayc_t *child = container->children->items[i];
+                                f(child, data);
+                                container_map(child, f, data);
+                        }
                 }
-                if (container->type == C_WORKSPACE) {
+                if (container->floating) {
                         for (i = 0; i < container->floating->length; ++i) {
                                 swayc_t *child = container->floating->items[i];
                                 f(child, data);
diff --git a/sway/focus.c b/sway/focus.c
index a3e5e77a..e369de30 100644
--- a/sway/focus.c
+++ b/sway/focus.c
@@ -34,7 +34,6 @@ static void update_focus(swayc_t *c) {
                                 mask = 2;
                                 container_map(c, set_view_visibility, &mask);
                                 wlc_output_set_mask(parent->handle, 2);
-                                c->parent->focused = c;
                                 destroy_workspace(ws);
                         }
                         break;