Merge branch 'backport' into work

[chaz/openbox] / openbox / place.c

diff --git a/openbox/place.c b/openbox/place.c
index 9e38bdefb0b7400bf01a7f145e785f75d9563226..aac40e8a099249c0620e7513269f556b766c56d8 100644 (file)
--- a/openbox/place.c
+++ b/openbox/place.c
@@ -489,8 +489,9 @@ gboolean place_client(ObClient *client, gint *x, gint *y,
     gboolean userplaced = FALSE;
 
     /* per-app settings override program specified position
-     * but not user specified */
-    if ((client->positioned & USPosition) ||
+     * but not user specified, unless pos_force is enabled */
+    if (((client->positioned & USPosition) &&
+         !(settings && settings->pos_given && settings->pos_force)) ||
         ((client->positioned & PPosition) &&
          !(settings && settings->pos_given)))
         return FALSE;