Merge branch 'master' into next

2014-06-28 13:05:40 +02:00 · 2014-06-28 13:05:40 +02:00 · 0279401528
parent 2d28273cac b5f3679a66
commit 0279401528
1 changed files with 1 additions and 2 deletions
--- a/src/x.c
+++ b/src/x.c
@ -1140,8 +1140,7 @@ void x_set_i3_atoms(void) {
 *
 */
 void x_set_warp_to(Rect *rect) {
-    if (!config.disable_focus_follows_mouse &&
-        config.mouse_warping != POINTER_WARPING_NONE)
+    if (config.mouse_warping != POINTER_WARPING_NONE)
        warp_to = rect;
 }