From: Dana Jansens <danakj@orodu.net>
Date: Tue, 24 Apr 2007 14:27:50 +0000 (+0000)
Subject: merge r5867 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~232
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=c97cd34759ea251fde8ee499fd374219685e1885;p=dana%2Fopenbox.git

merge r5867 from trunk
---

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index c34cf81b..6db822c3 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -269,32 +269,31 @@ static void do_move(gboolean resist)
 
 static void do_resize()
 {
-    gint x, y, w, h, lw, lh;
-
-    /* see if it is actually going to resize */
-    x = moveresize_client->area.x;
-    y = moveresize_client->area.y;
-    w = cur_x;
-    h = cur_y;
-    client_try_configure(moveresize_client, lockcorner, &x, &y, &w, &h,
-                         &lw, &lh, TRUE);
-    if (w == moveresize_client->area.width &&
-        h == moveresize_client->area.height)
-    {
-        return;
-    }
-
 #ifdef SYNC
     if (config_resize_redraw && extensions_sync &&
         moveresize_client->sync_request && moveresize_client->sync_counter)
     {
         XEvent ce;
         XSyncValue val;
+        gint x, y, w, h, lw, lh;
 
         /* are we already waiting for the sync counter to catch up? */
         if (waiting_for_sync)
             return;
 
+        /* see if it is actually going to resize */
+        x = moveresize_client->area.x;
+        y = moveresize_client->area.y;
+        w = cur_x;
+        h = cur_y;
+        client_try_configure(moveresize_client, lockcorner, &x, &y, &w, &h,
+                             &lw, &lh, TRUE);
+        if (w == moveresize_client->area.width &&
+            h == moveresize_client->area.height)
+        {
+            return;
+        }
+
         /* increment the value we're waiting for */
         ++moveresize_client->sync_counter_value;
         XSyncIntToValue(&val, moveresize_client->sync_counter_value);