summaryrefslogtreecommitdiff
path: root/desktop-shell/exposay.c
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2014-05-24 02:43:04 +0200
committerKristian Høgsberg <krh@bitplanet.net>2014-06-18 17:14:40 -0700
commit5905ebcc33605e4520abcfd9664caf9c95d72098 (patch)
tree7089f8184e43d426d814ceea54ca44a4f22bebcd /desktop-shell/exposay.c
parent91f80f24b4368fe36edbca676ea2777df29cfc5c (diff)
downloadweston-5905ebcc33605e4520abcfd9664caf9c95d72098.tar.gz
exposay: fix crash when navigating with the keyboard
Commit a7592019 introduced an optimization that caused some exposay struct members to not be properly initialized, particularly cur_output, leading to crashes in some circumstances (e.g. pressing the down arrow key after going to exposay). Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Diffstat (limited to 'desktop-shell/exposay.c')
-rw-r--r--desktop-shell/exposay.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop-shell/exposay.c b/desktop-shell/exposay.c
index 1d8b40e1..104b9d95 100644
--- a/desktop-shell/exposay.c
+++ b/desktop-shell/exposay.c
@@ -323,8 +323,10 @@ exposay_layout(struct desktop_shell *shell, struct shell_output *shell_output)
i++;
}
- if (highlight)
+ if (highlight) {
+ shell->exposay.focus_current = NULL;
exposay_highlight_surface(shell, highlight);
+ }
weston_compositor_schedule_repaint(shell->compositor);