From 2190bb9386eeb98d25647ab7181d64ce4e15f254 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 21 Mar 2015 23:02:35 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20overwrite=20border=20width=20wh?=
 =?UTF-8?q?en=20already=20set=20(placeholders).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #1501
---
 src/manage.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/manage.c b/src/manage.c
index 077d5720..2b3c6743 100644
--- a/src/manage.c
+++ b/src/manage.c
@@ -452,7 +452,9 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
     }
 
     /* explicitly set the border width to the default */
-    nc->current_border_width = (want_floating ? config.default_floating_border_width : config.default_border_width);
+    if (nc->current_border_width == -1) {
+        nc->current_border_width = (want_floating ? config.default_floating_border_width : config.default_border_width);
+    }
 
     /* to avoid getting an UnmapNotify event due to reparenting, we temporarily
      * declare no interest in any state change event of this window */