aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
authorVincent Vanlaer <vincent.vanlaer@skynet.be>2018-02-08 13:07:39 +0100
committerVincent Vanlaer <vincent.vanlaer@skynet.be>2018-02-08 13:07:39 +0100
commit84234b43114307892516935d1026fef0c5fdc68e (patch)
treee14ec640d023c75cbc2e68a4b36abd1d7362773b /rootston
parent90eb50d9aabe7665ae081c869b2986c691150b56 (diff)
parent78dc0c7de13c19257c6f186f9d7cf1d211c310e8 (diff)
Merge branch 'master' into cancel-grab
Diffstat (limited to 'rootston')
-rw-r--r--rootston/xdg_shell_v6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 0515263b..884d0d05 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -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;
}