Merge pull request #3368 from orestisf1993/render_root

[i3/i3] / src / commands.c

diff --git a/src/commands.c b/src/commands.c
index 0874eec2346c12c753e31e6aacf09af43f8c0aac..0343f9dc3525f9a68366f1b0839fde9a764a48f5 100644 (file)
--- a/src/commands.c
+++ b/src/commands.c
@@ -1272,7 +1272,7 @@ void cmd_focus_direction(I3_CMD, const char *direction) {
 static void cmd_focus_force_focus(Con *con) {
     /* Disable fullscreen container in workspace with container to be focused. */
     Con *ws = con_get_workspace(con);
-    Con *fullscreen_on_ws = (focused && focused->fullscreen_mode == CF_GLOBAL) ? focused : con_get_fullscreen_con(ws, CF_OUTPUT);
+    Con *fullscreen_on_ws = con_get_fullscreen_covering_ws(ws);
     if (fullscreen_on_ws && fullscreen_on_ws != con && !con_has_parent(con, fullscreen_on_ws)) {
         con_disable_fullscreen(fullscreen_on_ws);
     }