Merge pull request #3368 from orestisf1993/render_root

[i3/i3] / src / con.c

diff --git a/src/con.c b/src/con.c
index 844d9b68a11435c4e3bc3650150b601e69268571..253d1d541cc9ddb839d72bdc9964dc3712fef07b 100644 (file)
--- a/src/con.c
+++ b/src/con.c
@@ -1711,8 +1711,7 @@ adjacent_t con_adjacent_borders(Con *con) {
  *
  */
 int con_border_style(Con *con) {
-    Con *fs = con_get_fullscreen_con(con->parent, CF_OUTPUT);
-    if (fs == con) {
+    if (con->fullscreen_mode == CF_OUTPUT || con->fullscreen_mode == CF_GLOBAL) {
         DLOG("this one is fullscreen! overriding BS_NONE\n");
         return BS_NONE;
     }