Merge branch 'master' into next

2012-09-28 18:24:04 +02:00 · 2012-09-28 18:24:04 +02:00 · cd2a1267c8
parent a2daf229fb 6553ecf46d
commit cd2a1267c8
1 changed files with 1 additions and 1 deletions
--- a/src/floating.c
+++ b/src/floating.c
@ -581,7 +581,7 @@ void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t
                free(inside_event);
        } while ((inside_event = xcb_poll_for_event(conn)) != NULL);

-        if (last_motion_notify == NULL)
+        if (last_motion_notify == NULL || loop_done)
            continue;

        new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x;