If a window is added to the focus order while focus cycling, stop the focus cycling...

[chaz/openbox] / openbox / resist.c

diff --git a/openbox/resist.c b/openbox/resist.c
index 62c2b293f0b9fe1879df403e0c5db067c24c15ca..91eabcb08b49c8fd039b58ae3c815cf71b6e3dcd 100644 (file)
--- a/openbox/resist.c
+++ b/openbox/resist.c
@@ -23,6 +23,7 @@
 #include "screen.h"
 #include "dock.h"
 #include "config.h"
+#include "resist.h"
 #include "parser/parse.h"
 
 #include <glib.h>
@@ -161,7 +162,8 @@ void resist_move_monitors(ObClient *c, gint resist, gint *x, gint *y)
     cr = RECT_RIGHT(c->frame->area);
     cb = RECT_BOTTOM(c->frame->area);
 
-    RECT_SET(desired_area, *x, *y, c->area.width, c->area.height);
+    RECT_SET(desired_area, c->frame->area.x, c->frame->area.y,
+             c->frame->area.width, c->frame->area.height);
 
     for (i = 0; i < screen_num_monitors; ++i) {
         parea = screen_physical_area_monitor(i);