Merge remote-tracking branch 'bnf/fix'

14 years ago · b1ba0d1f99
parent 9d4db0996f b7c00a4376
commit b1ba0d1f99
1 changed files with 3 additions and 2 deletions
--- a/compositor/compositor.c
+++ b/compositor/compositor.c
@ -1471,8 +1471,9 @@ notify_keyboard_focus(struct wl_input_device *device,
 			update_modifier_state(wd, *k, 1);
 		}

-		wl_input_device_set_keyboard_focus(&wd->input_device,
-						   &es->surface, time);
+		if (es->surface.client)
+			wl_input_device_set_keyboard_focus(&wd->input_device,
+							   &es->surface, time);
 	} else {
 		end = device->keys.data + device->keys.size;
 		for (k = device->keys.data; k < end; k++)