summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-04-14 10:10:40 -0400
committerOwen W. Taylor <otaylor@fishsoup.net>2011-05-25 14:22:57 -0400
commitc8aaa5e33e247a8e6ae301ebd842b5eb3407724d (patch)
treeab186556733e213943e79a1fd41b5dadc5c1fa8d
parent65aa3e3927cc97e6d21fd24f5a8251d1ace385b6 (diff)
downloadmutter-c8aaa5e33e247a8e6ae301ebd842b5eb3407724d.tar.gz
Fix crash in meta_display_get_above_tab_keycode
https://bugzilla.gnome.org/show_bug.cgi?id=647777
-rw-r--r--src/core/above-tab-keycode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/above-tab-keycode.c b/src/core/above-tab-keycode.c
index 56966ab0f..856afe5d9 100644
--- a/src/core/above-tab-keycode.c
+++ b/src/core/above-tab-keycode.c
@@ -76,6 +76,8 @@ compute_above_tab_keycode (Display *xdisplay)
keyboard = XkbGetKeyboard (xdisplay,
XkbGBN_ClientSymbolsMask | XkbGBN_KeyNamesMask | XkbGBN_GeometryMask,
XkbUseCoreKbd);
+ if (!keyboard)
+ return best_keycode;
geometry = keyboard->geom;