From: Michael Stapelberg <michael@stapelberg.de>
Date: Tue, 28 Dec 2010 01:27:11 +0000 (+0100)
Subject: Bugfix: Don’t focus next window if the window was not mapped at the moment (on a... 
X-Git-Tag: tree-pr2~156
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d1845879594215450a2b8c898e6a3418ab27cdce;p=i3%2Fi3

Bugfix: Don’t focus next window if the window was not mapped at the moment (on a different ws)
---

diff --git a/src/tree.c b/src/tree.c
index 1edbf735..f86ae312 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -145,6 +145,7 @@ static void fix_floating_parent(Con *con, Con *vanishing) {
  *
  */
 void tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
+    bool was_mapped = con->mapped;
     Con *parent = con->parent;
 
     /* check floating clients and adjust old_parent if necessary */
@@ -196,9 +197,13 @@ void tree_close(Con *con, bool kill_window, bool dont_kill_parent) {
     if (!next)
         return;
 
-    DLOG("focusing %p / %s\n", next, next->name);
-    /* TODO: check if the container (or one of its children) was focused */
-    con_focus(next);
+    if (was_mapped) {
+        DLOG("focusing %p / %s\n", next, next->name);
+        /* TODO: check if the container (or one of its children) was focused */
+        con_focus(next);
+    } else {
+        DLOG("not focusing, was not mapped\n");
+    }
 
     /* check if the parent container is empty now and close it */
     if (!dont_kill_parent &&