oops, added borders to windows when keepborder was on and they didnt have one to start with, ie docks etc

1 files changed, 2 insertions, 1 deletions

diff --git a/openbox/client.c b/openbox/client.c
index 866c6c01..457a0f6a 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1304,7 +1304,8 @@ void client_setup_decor_and_functions(ObClient *self)
                    (self->mwmhints.decorations & OB_MWM_DECOR_TITLE)))
                 /* if the mwm hints request no handle or title, then all
                    decorations are disabled */
-                self->decorations = config_theme_keepborder ? OB_FRAME_DECOR_BORDER : 0;
+                self->decorations = config_theme_keepborder ?
+                    self->decorations & OB_FRAME_DECOR_BORDER : 0;
         }
     }