dont give decorless windows a border when toggling decorations

diff --git a/openbox/client.c b/openbox/client.c
index b3ea0082e3248aea83e1005f59a982f572133cff..ec90ba249f349c033f8e6b00878a4a22a6c2d4e6 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1180,9 +1180,9 @@ void client_setup_decor_and_functions(ObClient *self)
         self->decorations &= ~OB_FRAME_DECOR_HANDLE;
 
     /* finally, the user can have requested no decorations, which overrides
-       everything */
+       everything (but doesnt give it a border if it doesnt have one) */
     if (self->undecorated)
-        self->decorations = OB_FRAME_DECOR_BORDER;
+        self->decorations &= OB_FRAME_DECOR_BORDER;
 
     /* if we don't have a titlebar, then we cannot shade! */
     if (!(self->decorations & OB_FRAME_DECOR_TITLEBAR))