Merge branch 'backport' into work

[dana/openbox.git] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 0975214..e8a532c 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1690,7 +1690,7 @@ static gboolean frame_animate_iconify(gpointer p)
     g_get_current_time(&now);
     time = frame_animate_iconify_time_left(self, &now);
 
-    if (time == 0 || iconifying) {
+    if ((time > 0 && iconifying) || (time == 0 && !iconifying)) {
         /* start where the frame is supposed to be */
         x = self->area.x;
         y = self->area.y;
@@ -1721,12 +1721,11 @@ static gboolean frame_animate_iconify(gpointer p)
         h = self->size.top; /* just the titlebar */
     }
 
+    XMoveResizeWindow(obt_display, self->window, x, y, w, h);
+    XFlush(obt_display);
+
     if (time == 0)
         frame_end_iconify_animation(self);
-    else {
-        XMoveResizeWindow(obt_display, self->window, x, y, w, h);
-        XFlush(obt_display);
-    }
 
     return time > 0; /* repeat until we're out of time */
 }