diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-06-23 17:44:13 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-06-23 17:44:13 -0400 |
| commit | b1ba0d1f997c4715c444edeb7371a47907f404ed (patch) | |
| tree | d03d277134bdc0d50a5309f12bd7ffc814b23918 | |
| parent | 9d4db0996f48872482409345e6c458a46b9e8630 (diff) | |
| parent | b7c00a437643480a9573f97c91d6fca7acce895f (diff) | |
Merge remote-tracking branch 'bnf/fix'
| -rw-r--r-- | compositor/compositor.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compositor/compositor.c b/compositor/compositor.c index 5259976..4d5b652 100644 --- 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++) |