X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fmoveresize.c;h=9f9d4dfda388080c2512a5dd4c0b586b11c9d190;hb=ac56fe1602af7f4a4ae5c10cfe83e3d9eaf02b4d;hp=afd0de2abbf11086b318599f6a5b533638f289e6;hpb=9a9e3f6bf6be75094636e37d54fb16e4456b43be;p=chaz%2Fopenbox

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index afd0de2a..9f9d4dfd 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -153,12 +153,14 @@ void moveresize_start(ObClient *c, gint x, gint y, guint b, guint32 cnr)
     moving = (cnr == prop_atoms.net_wm_moveresize_move ||
               cnr == prop_atoms.net_wm_moveresize_move_keyboard);
 
-    if (moveresize_in_progress || !c->frame->visible ||
+    if (moveresize_in_progress || !frame_visible(c->frame) ||
         !(moving ?
           (c->functions & OB_CLIENT_FUNC_MOVE) :
           (c->functions & OB_CLIENT_FUNC_RESIZE)))
         return;
 
+    frame_end_iconify_animation(c->frame);
+
     moveresize_client = c;
     start_cx = c->area.x;
     start_cy = c->area.y;
@@ -407,12 +409,12 @@ gboolean moveresize_event(XEvent *e)
             start_y = e->xbutton.y_root;
             button = e->xbutton.button; /* this will end it now */
         }
-        used = TRUE;
+        used = e->xbutton.button == button;
     } else if (e->type == ButtonRelease) {
         if (!button || e->xbutton.button == button) {
             moveresize_end(FALSE);
+            used = TRUE;
         }
-        used = TRUE;
     } else if (e->type == MotionNotify) {
         if (moving) {
             cur_x = start_cx + e->xmotion.x_root - start_x;