]> git.sur5r.net Git - i3/i3/commitdiff
Bugfix: don’t errnously render floating fullscreen windows during restart
authorMichael Stapelberg <michael@stapelberg.de>
Fri, 13 Jun 2014 20:21:00 +0000 (22:21 +0200)
committerMichael Stapelberg <michael@stapelberg.de>
Fri, 13 Jun 2014 20:21:00 +0000 (22:21 +0200)
fixes #1263

src/render.c

index 2cc50d5739c9b83049b64d7b930a14a281e8da50..0ae893cd54df7be944d4771134697cabd4cd34da 100644 (file)
@@ -272,6 +272,12 @@ void render_con(Con *con, bool render_fullscreen) {
                 /* Don’t render floating windows when there is a fullscreen window
                  * on that workspace. Necessary to make floating fullscreen work
                  * correctly (ticket #564). */
+                /* If there is no fullscreen->window, this cannot be a
+                 * transient window, so we _know_ we need to skip it. This
+                 * happens during restarts where the container already exists,
+                 * but the window was not yet associated. */
+                if (fullscreen != NULL && fullscreen->window == NULL)
+                    continue;
                 if (fullscreen != NULL && fullscreen->window != NULL) {
                     Con *floating_child = con_descend_focused(child);
                     Con *transient_con = floating_child;