From: Dana Jansens <danakj@orodu.net>
Date: Sun, 27 May 2007 04:16:29 +0000 (+0000)
Subject: merge r6930 from trunk
X-Git-Tag: openbox-3_3_995-RELEASE~61
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5fe35e35b17f2f905836590a4739177fc7d64b46;p=dana%2Fopenbox.git

merge r6930 from trunk
---

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 8ef18a87..7b946007 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -152,12 +152,11 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
 void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
 {
     ObCursor cur;
-
-    moving = (cnr == prop_atoms.net_wm_moveresize_move ||
-              cnr == prop_atoms.net_wm_moveresize_move_keyboard);
+    gboolean mv = (cnr == prop_atoms.net_wm_moveresize_move ||
+                   cnr == prop_atoms.net_wm_moveresize_move_keyboard);
 
     if (moveresize_in_progress || !c->frame->visible ||
-        !(moving ?
+        !(mv ?
           (c->functions & OB_CLIENT_FUNC_MOVE) :
           (c->functions & OB_CLIENT_FUNC_RESIZE)))
         return;
@@ -197,6 +196,7 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
 
     frame_end_iconify_animation(c->frame);
 
+    moving = mv;
     moveresize_client = c;
     start_cx = c->area.x;
     start_cy = c->area.y;