Bugfix: When moving floating cons to other workspaces, attach them to the workspace

[i3/i3] / src / workspace.c

diff --git a/src/workspace.c b/src/workspace.c
index 4e93b92e08079613bdbdc17fd487f22217e2e2cd..8104aa89fc35d6da21765408718255e5d06a0473 100644 (file)
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -227,18 +227,13 @@ void workspace_show(const char *num) {
     }
     assert(old != NULL);
 
-    /* Check if the the currently focused con is on the same Output as the
-     * workspace we chose as 'old'. If not, use the workspace of the currently
-     * focused con */
-    Con *ws = con_get_workspace(focused);
-    if (ws && ws->parent != old->parent)
-        old = ws;
-
     /* enable fullscreen for the target workspace. If it happens to be the
      * same one we are currently on anyways, we can stop here. */
     workspace->fullscreen_mode = CF_OUTPUT;
-    if (workspace == old)
+    if (workspace == con_get_workspace(focused)) {
+        DLOG("Not switching, already there.\n");
         return;
+    }
 
     workspace_reassign_sticky(workspace);