From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Jan 2015 17:20:43 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.9~23
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3b4ae812e3543681a331bb72e6ae50038c4ab7bc;p=i3%2Fi3

Merge branch 'master' into next

Conflicts:
	src/render.c
---

3b4ae812e3543681a331bb72e6ae50038c4ab7bc
diff --cc src/render.c
index 3cc50063,2f39b082..7f92d4d4
--- a/src/render.c
+++ b/src/render.c
@@@ -247,8 -255,10 +255,10 @@@ void render_con(Con *con, bool render_f
          render_l_output(con);
      } else if (con->type == CT_ROOT) {
          Con *output;
-         TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
-             render_con(output, false);
+         if (!fullscreen) {
 -            TAILQ_FOREACH (output, &(con->nodes_head), nodes) {
++            TAILQ_FOREACH(output, &(con->nodes_head), nodes) {
+                 render_con(output, false);
+             }
          }
  
          /* We need to render floating windows after rendering all outputs’