Merge branch 'fix-dump-log-errmsg'

[i3/i3] / src / floating.c

diff --git a/src/floating.c b/src/floating.c
index 3f38761f1e34dfb72d516438fb2a8a330dde70c6..3b69116988fc8470655e2f24b486486628b1a9c6 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -15,7 +15,7 @@ extern xcb_connection_t *conn;
  * Calculates sum of heights and sum of widths of all currently active outputs
  *
  */
-Rect total_outputs_dimensions() {
+static Rect total_outputs_dimensions(void) {
     Output *output;
     /* Use Rect to encapsulate dimensions, ignoring x/y */
     Rect outputs_dimensions = {0, 0, 0, 0};
@@ -274,7 +274,7 @@ void floating_disable(Con *con, bool automatic) {
     /* 2: kill parent container */
     TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
     TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
-    tree_close(con->parent, DONT_KILL_WINDOW, false, false);
+    tree_close(con->parent, DONT_KILL_WINDOW, true, false);
 
     /* 3: re-attach to the parent of the currently focused con on the workspace
      * this floating con was on */