Fix incorrect merge *sigh*

[i3/i3] / src / con.c

diff --git a/src/con.c b/src/con.c
index 4d0c43e3562133e59920bf359b177fca974e90c3..985d07da2dd8e58058fe7e0bea207f62ab7ac572 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -243,13 +243,6 @@ void con_focus(Con *con) {
         workspace_update_urgent_flag(con_get_workspace(con));
         ipc_send_window_event("urgent", con);
     }
-
-    /* Focusing a container with a floating parent should raise it to the top. Since
-     * con_focus is called recursively for each parent we don't need to use
-     * con_inside_floating(). */
-    if (con->type == CT_FLOATING_CON) {
-        floating_raise_con(con);
-    }
 }
 
 /*