Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2014-06-28 13:05:40 +02:00
commit 0279401528
1 changed files with 1 additions and 2 deletions

View File

@ -1140,8 +1140,7 @@ void x_set_i3_atoms(void) {
* *
*/ */
void x_set_warp_to(Rect *rect) { void x_set_warp_to(Rect *rect) {
if (!config.disable_focus_follows_mouse && if (config.mouse_warping != POINTER_WARPING_NONE)
config.mouse_warping != POINTER_WARPING_NONE)
warp_to = rect; warp_to = rect;
} }