Merge branch 'master' into cancel-grab

This commit is contained in:
Vincent Vanlaer 2018-02-08 13:07:39 +01:00
commit 84234b4311
2 changed files with 28 additions and 12 deletions

View file

@ -101,7 +101,7 @@ static void move_resize(struct roots_view *view, double x, double y,
constrained_height);
if (serial > 0) {
roots_surface->pending_move_resize_configure_serial = serial;
} else {
} else if (roots_surface->pending_move_resize_configure_serial == 0) {
view->x = x;
view->y = y;
}