Merge branch 'master' into next

2012-02-07 17:42:58 -05:00
parent 4fe974408d 1ddde16895
commit ed2bcc15e3
2 changed files with 23 additions and 1 deletions
--- a/src/tree.c
+++ b/src/tree.c
@ -350,7 +350,8 @@ void tree_split(Con *con, orientation_t orientation) {
    /* if we are in a container whose parent contains only one
     * child (its split functionality is unused so far), we just change the
     * orientation (more intuitive than splitting again) */
-    if (con_num_children(parent) == 1) {
+    if (con_num_children(parent) == 1 &&
+        parent->layout == L_DEFAULT) {
        parent->orientation = orientation;
        DLOG("Just changing orientation of existing container\n");
        return;